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.125 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
27#endif
28
29#include <assert.h>
12#include <math.h> 30#include <math.h>
13#include <string.h> 31#include <string.h>
14#include <stdio.h> 32#include <stdio.h>
15#include <stdlib.h> 33#include <stdlib.h>
16 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
17#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
18#include <SDL_endian.h> 39#include <SDL_endian.h>
19#include <SDL_image.h> 40#include <SDL_image.h>
20#include <SDL_mixer.h> 41#include <SDL_mixer.h>
21#include <SDL_opengl.h> 42#include <SDL_opengl.h>
22 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
23#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
24#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
25 51
26#include <glib/gmacros.h> 52#include <glib/gmacros.h>
27 53
28#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
29 66
30#ifndef _WIN32 67#ifndef _WIN32
31# include <sys/types.h> 68# include <sys/types.h>
32# include <sys/socket.h> 69# include <sys/socket.h>
33# include <netinet/in.h> 70# include <netinet/in.h>
34# include <netinet/tcp.h> 71# include <netinet/tcp.h>
35# include <inttypes.h> 72# include <inttypes.h>
73#endif
74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
36#else 77#else
37 typedef unsigned char uint8_t; 78# define expect(expr,value) (expr)
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 79#endif
44 80
45#include "glext.h" 81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
46 83
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 85
49#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
50 87
51#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
53 90
54#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
55 92
56#if 1 93/* mask out modifiers we are not interested in */
57# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
58#else 95
59# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
60#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
101
102static AV *texture_av;
61 103
62static struct 104static struct
63{ 105{
64#define GL_FUNC(ptr,name) ptr name; 106#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 107#include "glfunc.h"
66#undef GL_FUNC 108#undef GL_FUNC
67} gl; 109} gl;
68 110
111static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 112gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 113{
71 if (gl.BlendFuncSeparate) 114 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 115 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 116 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 117 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 118 else
76 glBlendFunc (sa, da); 119 glBlendFunc (sa, da);
77} 120}
78 121
122static GLuint
123gen_texture ()
124{
125 GLuint name;
126
127 if (AvFILL (texture_av) >= 0)
128 name = (GLuint)(size_t)av_pop (texture_av);
129 else
130 glGenTextures (1, &name);
131
132 return name;
133}
134
135static void
136del_texture (GLuint name)
137{
138 /* make a half-assed attempt at returning the memory used by the texture */
139 /* textures are frequently being reused by cfplus anyway */
140 /*glBindTexture (GL_TEXTURE_2D, name);*/
141 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
142 av_push (texture_av, (SV *)(size_t)name);
143 glDeleteTextures (1, &name);
144}
145
79#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
80 148
81#include "pango-font.c" 149#include "pango-font.c"
82#include "pango-fontmap.c" 150#include "pango-fontmap.c"
83#include "pango-render.c" 151#include "pango-render.c"
84 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
85typedef Mix_Chunk *CFClient__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 156typedef Mix_Music *DC__MixMusic;
87 157
88typedef PangoFontDescription *CFClient__Font; 158typedef PangoFontDescription *DC__Font;
89 159
90static int 160static int
91shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
92{ 162{
93 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 177
108typedef struct cf_layout { 178typedef struct cf_layout {
109 PangoLayout *pl; 179 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
111 int base_height; 181 int base_height;
112 CFClient__Font font; 182 DC__Font font;
183 rc_t *rc;
113} *CFClient__Layout; 184} *DC__Layout;
114 185
115static CFClient__Font default_font; 186static DC__Font default_font;
116static PangoContext *opengl_context; 187static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
118 189
119static void 190static void
120substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
125#endif 196#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 198}
128 199
129static void 200static void
130layout_update_font (CFClient__Layout self) 201layout_update_font (DC__Layout self)
131{ 202{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
134 */ 205 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
136 207
137 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
138 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
139 210
140 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
141} 212}
142 213
143static void 214static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
145{ 216{
217 PangoRectangle rect;
218
219 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 220 pango_layout_get_extents (self->pl, 0, &rect);
147 221
148 if (!*w) *w = 1; 222 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 223 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 224
151 *w = (*w + 3) & ~3; 225 if (!rect.width) rect.width = 1;
152} 226 if (!rect.height) rect.height = 1;
153 227
228 *w = rect.width;
229 *h = rect.height;
230}
231
232typedef uint16_t tileid;
154typedef uint16_t mapface; 233typedef uint16_t faceid;
155 234
156typedef struct { 235typedef struct {
157 GLint name; 236 GLuint name;
158 int w, h; 237 int w, h;
159 float s, t; 238 float s, t;
160 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
240 tileid smoothtile;
241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
161} maptex; 243} maptex;
162 244
163typedef struct { 245typedef struct {
246 uint32_t player;
247 tileid tile[3];
164 int16_t darkness; 248 uint16_t darkness;
165 mapface face[3]; 249 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 250} mapcell;
167 251
168typedef struct { 252typedef struct {
169 int32_t c0, c1; 253 int32_t c0, c1;
170 mapcell *col; 254 mapcell *col;
171} maprow; 255} maprow;
172 256
173typedef struct map { 257typedef struct map {
174 int x, y, w, h; 258 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 259 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 260 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 261 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 262
182 int32_t rows; 263 int32_t rows;
183 maprow *row; 264 maprow *row;
184} *CFClient__Map; 265} *DC__Map;
185 266
186static char * 267static char *
187prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
188{ 269{
189 char *p; 270 char *p;
… …
206} 287}
207 288
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 291
292static void
293need_facenum (struct map *self, faceid face)
294{
295 while (self->faces <= face)
296 {
297 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2;
299 }
300}
301
302static void
303need_texid (struct map *self, int texid)
304{
305 while (self->texs <= texid)
306 {
307 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2;
309 }
310}
311
211static maprow * 312static maprow *
212map_get_row (CFClient__Map self, int y) 313map_get_row (DC__Map self, int y)
213{ 314{
214 if (0 > y) 315 if (0 > y)
215 { 316 {
216 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
255 356
256 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
257} 358}
258 359
259static mapcell * 360static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
261{ 362{
262 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
263} 364}
264 365
265static void 366static void
266map_clear (CFClient__Map self) 367map_clear (DC__Map self)
267{ 368{
268 int r; 369 int r;
269 370
270 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
278 self->oy = 0; 379 self->oy = 0;
279 self->row = 0; 380 self->row = 0;
280 self->rows = 0; 381 self->rows = 0;
281} 382}
282 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
283static void 394static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
285{ 396{
286 int x, y; 397 int x, y;
287 maprow *row; 398 maprow *row;
399 mapcell *cell;
288 400
289 for (y = y0; y < y0 + h; y++) 401 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 402 if (y >= 0)
291 { 403 {
292 if (y >= self->rows) 404 if (y >= self->rows)
… …
298 if (x >= row->c0) 410 if (x >= row->c0)
299 { 411 {
300 if (x >= row->c1) 412 if (x >= row->c1)
301 break; 413 break;
302 414
303 row->col[x - row->c0].darkness = -1; 415 cell = row->col + x - row->c0;
416
417 CELL_CLEAR (cell);
304 } 418 }
305 } 419 }
420}
421
422typedef struct {
423 tileid tile;
424 uint8_t x, y, level;
425} smooth_key;
426
427static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits)
429{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
431
432 if (SvIOK (*sv))
433 SvIV_set (*sv, SvIVX (*sv) | bits);
434 else
435 sv_setiv (*sv, bits);
306} 436}
307 437
308static void 438static void
309music_finished (void) 439music_finished (void)
310{ 440{
… …
346 n |= n >> 16; 476 n |= n >> 16;
347 477
348 return n + 1; 478 return n + 1;
349} 479}
350 480
351MODULE = CFClient PACKAGE = CFClient 481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
492/* SDL should provide this, really. */
493#define SDLK_MODIFIER_MIN 300
494#define SDLK_MODIFIER_MAX 314
495
496/******************************************************************************/
497
498static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
499static GV *hover_gv;
500
501static int
502within_widget (SV *widget, NV x, NV y)
503{
504 HV *self;
505 SV **svp;
506 NV wx, ww, wy, wh;
507
508 if (!SvROK (widget))
509 return 0;
510
511 self = (HV *)SvRV (widget);
512
513 if (SvTYPE (self) != SVt_PVHV)
514 return 0;
515
516 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
517 if (y < wy)
518 return 0;
519
520 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
521 if (y >= wy + wh)
522 return 0;
523
524 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
525 if (x < wx)
526 return 0;
527
528 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
529 if (x >= wx + ww)
530 return 0;
531
532 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
533 if (!svp || !SvTRUE (*svp))
534 return 0;
535
536 return 1;
537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
352 592
353PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
354 594
355BOOT: 595BOOT:
356{ 596{
357 HV *stash = gv_stashpv ("CFClient", 1); 597 HV *stash = gv_stashpv ("DC", 1);
358 static const struct { 598 static const struct {
359 const char *name; 599 const char *name;
360 IV iv; 600 IV iv;
361 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
603 const_iv (SDLK_MODIFIER_MIN),
604 const_iv (SDLK_MODIFIER_MAX),
605
363 const_iv (SDL_ACTIVEEVENT), 606 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 607 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 608 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 609 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 610 const_iv (SDL_MOUSEBUTTONDOWN),
… …
376 const_iv (SDL_EVENT_RESERVEDA), 619 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 620 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 621 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 622 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
624
625 const_iv (SDL_APPINPUTFOCUS),
626 const_iv (SDL_APPMOUSEFOCUS),
627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
381 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
… …
440 const_iv (SDLK_BREAK), 740 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 741 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 742 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 743 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 744 const_iv (SDLK_UNDO),
745
445 const_iv (KMOD_NONE), 746 const_iv (KMOD_NONE),
747 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 748 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 749 const_iv (KMOD_RSHIFT),
750 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 751 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 752 const_iv (KMOD_RCTRL),
753 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 754 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 755 const_iv (KMOD_RALT),
756 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL), 762
458 const_iv (KMOD_SHIFT), 763 const_iv (KMOD_LRAM),
459 const_iv (KMOD_ALT), 764
460 const_iv (KMOD_META) 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
461# undef const_iv 795# undef const_iv
462 }; 796 };
463 797
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
800
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 803}
804
805void
806weaken (SV *rv)
807 PROTOTYPE: $
808 CODE:
809 sv_rvweaken (rv);
810
811int
812in_destruct ()
813 CODE:
814 RETVAL = PL_main_cv == Nullcv;
815 OUTPUT:
816 RETVAL
467 817
468NV floor (NV x) 818NV floor (NV x)
469 819
470NV ceil (NV x) 820NV ceil (NV x)
821
822IV minpot (UV n)
823
824IV popcount (UV n)
471 825
472void 826void
473pango_init () 827pango_init ()
474 CODE: 828 CODE:
475{ 829{
476 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
479} 838}
480 839
481int 840char *SDL_GetError ()
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 841
484void 842void SDL_braino ()
843
844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
485SDL_Quit () 850void SDL_Quit ()
486 851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
860
487void 861void
488SDL_ListModes () 862SDL_ListModes (int rgb, int alpha)
489 PPCODE: 863 PPCODE:
490{ 864{
491 SDL_Rect **m; 865 SDL_Rect **m;
492 866
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 867 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 868 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 869 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 870 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 871
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 872 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 874
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 875 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 879
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
508 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 882
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 884
513 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
514 while (*m) 886 while (*m)
515 { 887 {
888 if ((*m)->w >= 400 && (*m)->h >= 300)
889 {
516 AV *av = newAV (); 890 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
893 av_push (av, newSViv (rgb));
894 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 895 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
896 }
520 897
521 ++m; 898 ++m;
522 } 899 }
523} 900}
524 901
525char *
526SDL_GetError ()
527
528int 902int
529SDL_SetVideoMode (int w, int h, int fullscreen) 903SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 904 CODE:
905{
906 SDL_EnableUNICODE (1);
907 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
908
909 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
910 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
911 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
912 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
913
531 RETVAL = !!SDL_SetVideoMode ( 914 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 915 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 916 );
917
534 if (RETVAL) 918 if (RETVAL)
535 { 919 {
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 920 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 924#include "glfunc.h"
539# undef GL_FUNC 925#undef GL_FUNC
540 } 926 }
927}
541 OUTPUT: 928 OUTPUT:
542 RETVAL 929 RETVAL
543 930
544void 931void
545SDL_GL_SwapBuffers () 932SDL_GL_SwapBuffers ()
546 933
547char * 934char *
548SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
549 936
937int
938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
942
550void 943void
551SDL_PollEvent () 944poll_events ()
552 PPCODE: 945 PPCODE:
553{ 946{
554 SDL_Event ev; 947 SDL_Event ev;
555 948
556 while (SDL_PollEvent (&ev)) 949 SDL_PumpEvents ();
950 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 951 {
558 HV *hv = newHV (); 952 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 953 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 954
561 switch (ev.type) 955 switch (ev.type)
562 { 956 {
563 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
564 case SDL_KEYUP: 958 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
962 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 964 break;
570 965
571 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 969 break;
575 970
576 case SDL_MOUSEMOTION: 971 case SDL_MOUSEMOTION:
972 {
973 int state = ev.motion.state;
974 int x = ev.motion.x;
975 int y = ev.motion.y;
976 int xrel = ev.motion.xrel;
977 int yrel = ev.motion.yrel;
978
979 /* do simplistic event compression */
980 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
981 && state == ev.motion.state)
982 {
983 xrel += ev.motion.xrel;
984 yrel += ev.motion.yrel;
985 x = ev.motion.x;
986 y = ev.motion.y;
987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
988 }
989
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
996 }
584 break; 997 break;
585 998
586 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
589 1002
590 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
591 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
592 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
593 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 1013 break;
601 } 1014 }
602 1015
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
604 } 1017 }
605} 1018}
606 1019
607int 1020int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
609 POSTCALL: 1022 POSTCALL:
610 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
611 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
612 1025
613void 1026void
1027Mix_QuerySpec ()
1028 PPCODE:
1029{
1030 int freq, channels;
1031 Uint16 format;
1032
1033 if (Mix_QuerySpec (&freq, &format, &channels))
1034 {
1035 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (freq)));
1037 PUSHs (sv_2mortal (newSViv (format)));
1038 PUSHs (sv_2mortal (newSViv (channels)));
1039 }
1040}
1041
1042void
614Mix_CloseAudio () 1043Mix_CloseAudio ()
615 1044
616int 1045int
617Mix_AllocateChannels (int numchans = -1) 1046Mix_AllocateChannels (int numchans = -1)
618 1047
1048const char *
1049Mix_GetError ()
1050
619void 1051void
620lowdelay (int fd, int val = 1) 1052lowdelay (int fd, int val = 1)
621 CODE: 1053 CODE:
1054 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
1055
1056void
1057win32_proxy_info ()
1058 PPCODE:
1059{
622#ifndef _WIN32 1060#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1061 char buffer[2048];
1062 DWORD buflen;
1063
1064 EXTEND (SP, 3);
1065
1066 buflen = sizeof (buffer);
1067 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
1068 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
1069 {
1070 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
1071
1072 buflen = sizeof (buffer);
1073 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
1074 {
1075 PUSHs (newSVpv (buffer, 0));
1076
1077 buflen = sizeof (buffer);
1078 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
1079 PUSHs (newSVpv (buffer, 0));
1080 }
1081 }
624#endif 1082#endif
1083}
625 1084
626void 1085int
627add_font (char *file) 1086add_font (char *file)
628 CODE: 1087 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
630 1091
631void 1092void
632load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
633 ALIAS: 1094 ALIAS:
634 load_image_file = 1 1095 load_image_file = 1
… …
637 STRLEN image_len; 1098 STRLEN image_len;
638 char *image = (char *)SvPVbyte (image_, image_len); 1099 char *image = (char *)SvPVbyte (image_, image_len);
639 SDL_Surface *surface, *surface2; 1100 SDL_Surface *surface, *surface2;
640 SDL_PixelFormat fmt; 1101 SDL_PixelFormat fmt;
641 SDL_RWops *rw = ix 1102 SDL_RWops *rw = ix
642 ? SDL_RWFromFile (image, "r") 1103 ? SDL_RWFromFile (image, "rb")
643 : SDL_RWFromConstMem (image, image_len); 1104 : SDL_RWFromConstMem (image, image_len);
644 1105
645 if (!rw) 1106 if (!rw)
646 croak ("load_image: %s", SDL_GetError ()); 1107 croak ("load_image: %s", SDL_GetError ());
647 1108
… …
676 1137
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 1138 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 1139
679 assert (surface2->pitch == surface2->w * 4); 1140 assert (surface2->pitch == surface2->w * 4);
680 1141
1142 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 1143 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 1144 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 1145 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1147 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1148 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2);
690 1151
691 SDL_FreeSurface (surface); 1152 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 1153 SDL_FreeSurface (surface2);
693} 1154}
694 1155
… …
720void 1181void
721error (char *message) 1182error (char *message)
722 CODE: 1183 CODE:
723 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
724#ifdef _WIN32 1185#ifdef _WIN32
725 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
726#endif 1187#endif
727 1188
728void 1189void
729fatal (char *message) 1190fatal (char *message)
730 CODE: 1191 CODE:
731 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
732#ifdef _WIN32 1193#ifdef _WIN32
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
734#endif 1195#endif
735 _exit (1); 1196 _exit (1);
736 1197
737void 1198void
738_exit (int retval) 1199_exit (int retval = 0)
739 CODE: 1200 CODE:
1201#ifdef WIN32
1202 ExitThread (retval); // unclean, please beam me up
1203#else
740 _exit (retval); 1204 _exit (retval);
1205#endif
741 1206
1207void
1208debug ()
1209 CODE:
1210{
1211#if DEBUG
1212 VALGRIND_DO_LEAK_CHECK;
1213#endif
1214}
1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
742MODULE = CFClient PACKAGE = CFClient::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
743 1224
744CFClient::Font 1225PROTOTYPES: DISABLE
1226
1227DC::Font
745new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
746 CODE: 1229 CODE:
747{ 1230{
748 int count; 1231 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 1235}
753 OUTPUT: 1236 OUTPUT:
754 RETVAL 1237 RETVAL
755 1238
756void 1239void
757DESTROY (CFClient::Font self) 1240DESTROY (DC::Font self)
758 CODE: 1241 CODE:
759 pango_font_description_free (self); 1242 pango_font_description_free (self);
760 1243
761void 1244void
762make_default (CFClient::Font self) 1245make_default (DC::Font self)
1246 PROTOTYPE: $
763 CODE: 1247 CODE:
764 default_font = self; 1248 default_font = self;
765 1249
766MODULE = CFClient PACKAGE = CFClient::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
767 1251
1252PROTOTYPES: DISABLE
1253
768void 1254void
769clear_font_cache () 1255glyph_cache_backup ()
1256 PROTOTYPE:
770 CODE: 1257 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap); 1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
772 tc_clear (); 1264 tc_restore ();
773 1265
774CFClient::Layout 1266DC::Layout
775new (SV *class, int type = 0) 1267new (SV *class)
776 CODE: 1268 CODE:
777 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
778 1270
779 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
780 RETVAL->r = 1.; 1272 RETVAL->r = 1.;
781 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
782 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
783 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
784 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
785 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
786 1279
787 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
788 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
789 OUTPUT: 1282 OUTPUT:
790 RETVAL 1283 RETVAL
791 1284
792void 1285void
793DESTROY (CFClient::Layout self) 1286DESTROY (DC::Layout self)
794 CODE: 1287 CODE:
795 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
796 Safefree (self); 1290 Safefree (self);
797 1291
798void 1292void
799set_text (CFClient::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
800 CODE: 1294 CODE:
801{ 1295{
802 STRLEN textlen; 1296 STRLEN textlen;
803 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
804 1298
805 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
806} 1300}
807 1301
808void 1302void
809set_markup (CFClient::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
810 CODE: 1304 CODE:
811{ 1305{
812 STRLEN textlen; 1306 STRLEN textlen;
813 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
814 1308
815 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
816} 1310}
817 1311
818void 1312void
819set_shapes (CFClient::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
820 CODE: 1314 CODE:
821{ 1315{
822 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text; 1318 const char *pos = text;
… …
859 if (attrs) 1353 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
861} 1355}
862 1356
863void 1357void
864get_shapes (CFClient::Layout self) 1358get_shapes (DC::Layout self)
865 PPCODE: 1359 PPCODE:
866{ 1360{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868 1362
869 do 1363 do
870 { 1364 {
871 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
872 1366
873 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
874 { 1368 {
875 PangoRectangle extents; 1369 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
877 1371
1372 EXTEND (SP, 2);
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1373 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1374 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 } 1375 }
881 } 1376 }
882 while (pango_layout_iter_next_run (iter)); 1377 while (pango_layout_iter_next_run (iter));
883 1378
884 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
885} 1380}
886 1381
887int 1382int
888has_wrapped (CFClient::Layout self) 1383has_wrapped (DC::Layout self)
889 CODE: 1384 CODE:
890{ 1385{
891 int lines = 1; 1386 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
893 1388
… …
898} 1393}
899 OUTPUT: 1394 OUTPUT:
900 RETVAL 1395 RETVAL
901 1396
902SV * 1397SV *
903get_text (CFClient::Layout self) 1398get_text (DC::Layout self)
904 CODE: 1399 CODE:
905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
906 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
907 OUTPUT: 1402 OUTPUT:
908 RETVAL 1403 RETVAL
909 1404
910void 1405void
911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1406set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
912 CODE: 1407 CODE:
913 self->r = r; 1408 self->r = r;
914 self->g = g; 1409 self->g = g;
915 self->b = b; 1410 self->b = b;
916 self->a = a; 1411 self->a = a;
917 1412
918void 1413void
919set_font (CFClient::Layout self, CFClient::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
920 CODE: 1415 CODE:
921 if (self->font != font) 1416 if (self->font != font)
922 { 1417 {
923 self->font = font; 1418 self->font = font;
924 layout_update_font (self); 1419 layout_update_font (self);
925 } 1420 }
926 1421
927void 1422void
928set_height (CFClient::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
929 CODE: 1424 CODE:
930 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
931 { 1426 {
932 self->base_height = base_height; 1427 self->base_height = base_height;
933 layout_update_font (self); 1428 layout_update_font (self);
934 } 1429 }
935 1430
936void 1431void
937set_width (CFClient::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
938 CODE: 1433 CODE:
939 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1434 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
940 1435
941void 1436void
942set_indent (CFClient::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
943 CODE: 1438 CODE:
944 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
945 1440
946void 1441void
947set_spacing (CFClient::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
948 CODE: 1443 CODE:
949 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
950 1445
951void 1446void
952set_ellipsise (CFClient::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
953 CODE: 1448 CODE:
954 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
955 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
956 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
957 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
958 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
959 ); 1454 );
960 1455
961void 1456void
962set_single_paragraph_mode (CFClient::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
963 CODE: 1458 CODE:
964 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
965 1460
966void 1461void
967size (CFClient::Layout self) 1462size (DC::Layout self)
968 PPCODE: 1463 PPCODE:
969{ 1464{
970 int w, h; 1465 int w, h;
971 1466
972 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
… …
975 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
976 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
977} 1472}
978 1473
979int 1474int
980descent (CFClient::Layout self) 1475descent (DC::Layout self)
981 CODE: 1476 CODE:
982{ 1477{
983 PangoRectangle rect; 1478 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
986 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
987} 1482}
988 OUTPUT: 1483 OUTPUT:
989 RETVAL 1484 RETVAL
990 1485
991int 1486int
992xy_to_index (CFClient::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
993 CODE: 1488 CODE:
994{ 1489{
995 int index, trailing; 1490 int index, trailing;
996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1491 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
997 RETVAL = index; 1492 RETVAL = index + trailing;
998} 1493}
999 OUTPUT: 1494 OUTPUT:
1000 RETVAL 1495 RETVAL
1001 1496
1002void 1497void
1003cursor_pos (CFClient::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1004 PPCODE: 1499 PPCODE:
1005{ 1500{
1006 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1007 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1008 1503
1009 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1010 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1013} 1508}
1014 1509
1015void 1510void
1016render (CFClient::Layout self, float x, float y) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1017 PPCODE: 1512 PPCODE:
1513{
1514 int line, x;
1515
1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1519 --line;
1520#endif
1521 EXTEND (SP, 2);
1522 PUSHs (sv_2mortal (newSViv (line)));
1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1524}
1525
1526void
1527line_x_to_index (DC::Layout self, int line, int x)
1528 PPCODE:
1529{
1530 PangoLayoutLine *lp;
1531 int index, trailing;
1532
1533 if (line < 0)
1534 XSRETURN_EMPTY;
1535
1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1537 XSRETURN_EMPTY; /* do better */
1538
1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1540
1541 EXTEND (SP, 2);
1542 if (GIMME_V == G_SCALAR)
1543 PUSHs (sv_2mortal (newSViv (index + trailing)));
1544 else
1545 {
1546 PUSHs (sv_2mortal (newSViv (index)));
1547 PUSHs (sv_2mortal (newSViv (trailing)));
1548 }
1549}
1550
1551void
1552render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE:
1554 rc_clear (self->rc);
1018 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1019 self->pl, 1556 self->pl,
1557 self->rc,
1020 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a 1559 self->r, self->g, self->b, self->a,
1560 flags
1022 ); 1561 );
1562 // we assume that context_change actually clears/frees stuff
1563 // and does not do any recomputation...
1564 pango_layout_context_changed (self->pl);
1023 1565
1566void
1567draw (DC::Layout self)
1568 CODE:
1569{
1570 glEnable (GL_TEXTURE_2D);
1571 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1572 glEnable (GL_BLEND);
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577
1578 rc_draw (self->rc);
1579
1580 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D);
1583}
1584
1024MODULE = CFClient PACKAGE = CFClient::Texture 1585MODULE = Deliantra::Client PACKAGE = DC::Texture
1025 1586
1026void 1587PROTOTYPES: ENABLE
1027pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE:
1029{
1030 int ow = SvIV (w_);
1031 int oh = SvIV (h_);
1032 1588
1033 if (ow && oh) 1589void
1590pad (SV *data_, int ow, int oh, int nw, int nh)
1591 CODE:
1592{
1593 if ((nw != ow || nh != oh) && SvOK (data_))
1034 { 1594 {
1035 int nw = minpot (ow);
1036 int nh = minpot (oh);
1037
1038 if (nw != ow || nh != oh)
1039 {
1040 if (SvOK (data_))
1041 {
1042 STRLEN datalen; 1595 STRLEN datalen;
1043 char *data = SvPVbyte (data_, datalen); 1596 char *data = SvPVbyte (data_, datalen);
1044 int bpp = datalen / (ow * oh); 1597 int bpp = datalen / (ow * oh);
1045 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1598 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1046 1599
1047 SvPOK_only (result_); 1600 SvPOK_only (result_);
1048 SvCUR_set (result_, nw * nh * bpp); 1601 SvCUR_set (result_, nw * nh * bpp);
1049 1602
1050 memset (SvPVX (result_), 0, nw * nh * bpp); 1603 memset (SvPVX (result_), 0, nw * nh * bpp);
1051 while (oh--) 1604 while (oh--)
1052 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1605 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1053 1606
1054 sv_setsv (data_, result_); 1607 sv_setsv (data_, result_);
1055 }
1056
1057 sv_setiv (w_, nw);
1058 sv_setiv (h_, nh);
1059 }
1060 } 1608 }
1061} 1609}
1062 1610
1063void 1611void
1064draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1612draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1070{ 1618{
1071 HV *hv = (HV *)SvRV (self); 1619 HV *hv = (HV *)SvRV (self);
1072 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1620 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1073 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1621 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1074 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1622 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1623
1624 if (name <= 0)
1625 XSRETURN_EMPTY;
1075 1626
1076 if (items < 5) 1627 if (items < 5)
1077 { 1628 {
1078 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1629 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1079 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1630 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1107 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1108 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1109 } 1660 }
1110} 1661}
1111 1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1690}
1691
1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1693 CODE:
1694{
1695 GLint width;
1696 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1697 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1698 RETVAL = width > 0;
1699}
1700 OUTPUT:
1701 RETVAL
1702
1112MODULE = CFClient PACKAGE = CFClient::Map 1703MODULE = Deliantra::Client PACKAGE = DC::Map
1113 1704
1114CFClient::Map 1705PROTOTYPES: DISABLE
1115new (SV *class, int map_width, int map_height) 1706
1707DC::Map
1708new (SV *class)
1116 CODE: 1709 CODE:
1117 New (0, RETVAL, 1, struct map); 1710 New (0, RETVAL, 1, struct map);
1118 RETVAL->x = 0; 1711 RETVAL->x = 0;
1119 RETVAL->y = 0; 1712 RETVAL->y = 0;
1120 RETVAL->w = map_width; 1713 RETVAL->w = 0;
1121 RETVAL->h = map_height; 1714 RETVAL->h = 0;
1122 RETVAL->ox = 0; 1715 RETVAL->ox = 0;
1123 RETVAL->oy = 0; 1716 RETVAL->oy = 0;
1124 RETVAL->faces = 8192; 1717 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1125 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1718 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1126 RETVAL->texs = 8192;
1127 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1128 RETVAL->rows = 0; 1719 RETVAL->rows = 0;
1129 RETVAL->row = 0; 1720 RETVAL->row = 0;
1130 OUTPUT: 1721 OUTPUT:
1131 RETVAL 1722 RETVAL
1132 1723
1133void 1724void
1134DESTROY (CFClient::Map self) 1725DESTROY (DC::Map self)
1135 CODE: 1726 CODE:
1136{ 1727{
1137 map_clear (self); 1728 map_clear (self);
1138 Safefree (self->face); 1729 Safefree (self->face2tile);
1139 Safefree (self->tex); 1730 Safefree (self->tex);
1140 Safefree (self); 1731 Safefree (self);
1141} 1732}
1142 1733
1143void 1734void
1735resize (DC::Map self, int map_width, int map_height)
1736 CODE:
1737 self->w = map_width;
1738 self->h = map_height;
1739
1740void
1144clear (CFClient::Map self) 1741clear (DC::Map self)
1145 CODE: 1742 CODE:
1146 map_clear (self); 1743 map_clear (self);
1147 1744
1148void 1745void
1149set_face (CFClient::Map self, int face, int texid) 1746set_tileid (DC::Map self, int face, int tile)
1150 CODE: 1747 CODE:
1151{ 1748{
1152 while (self->faces <= face) 1749 need_facenum (self, face); self->face2tile [face] = tile;
1153 { 1750 need_texid (self, tile);
1154 Append (mapface, self->face, self->faces, self->faces);
1155 self->faces *= 2;
1156 }
1157
1158 self->face [face] = texid;
1159} 1751}
1160 1752
1161void 1753void
1754set_smooth (DC::Map self, int face, int smooth, int level)
1755 CODE:
1756{
1757 tileid texid;
1758 maptex *tex;
1759
1760 if (face < 0 || face >= self->faces)
1761 return;
1762
1763 if (smooth < 0 || smooth >= self->faces)
1764 return;
1765
1766 texid = self->face2tile [face];
1767
1768 if (!texid)
1769 return;
1770
1771 tex = self->tex + texid;
1772 tex->smoothtile = self->face2tile [smooth];
1773 tex->smoothlevel = level;
1774}
1775
1776void
1162set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1777set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1163 CODE: 1778 CODE:
1164{ 1779{
1165 while (self->texs <= texid) 1780 need_texid (self, texid);
1166 {
1167 Append (maptex, self->tex, self->texs, self->texs);
1168 self->texs *= 2;
1169 }
1170 1781
1171 { 1782 {
1172 maptex *tex = self->tex + texid; 1783 maptex *tex = self->tex + texid;
1173 1784
1174 tex->name = name; 1785 tex->name = name;
… …
1190 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1191 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1193} 1804}
1194 1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1825
1195int 1826int
1196ox (CFClient::Map self) 1827ox (DC::Map self)
1197 ALIAS: 1828 ALIAS:
1198 oy = 1 1829 oy = 1
1199 x = 2 1830 x = 2
1200 y = 3 1831 y = 3
1201 w = 4 1832 w = 4
… …
1212 } 1843 }
1213 OUTPUT: 1844 OUTPUT:
1214 RETVAL 1845 RETVAL
1215 1846
1216void 1847void
1217scroll (CFClient::Map self, int dx, int dy) 1848scroll (DC::Map self, int dx, int dy)
1218 CODE: 1849 CODE:
1219{ 1850{
1220 if (dx > 0) 1851 if (dx > 0)
1221 map_blank (self, self->x, self->y, dx - 1, self->h); 1852 map_blank (self, self->x, self->y, dx, self->h);
1222 else if (dx < 0) 1853 else if (dx < 0)
1223 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1854 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1224 1855
1225 if (dy > 0) 1856 if (dy > 0)
1226 map_blank (self, self->x, self->y, self->w, dy - 1); 1857 map_blank (self, self->x, self->y, self->w, dy);
1227 else if (dy < 0) 1858 else if (dy < 0)
1228 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1859 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1229 1860
1230 self->ox += dx; self->x += dx; 1861 self->ox += dx; self->x += dx;
1231 self->oy += dy; self->y += dy; 1862 self->oy += dy; self->y += dy;
1232 1863
1233 while (self->y < 0) 1864 while (self->y < 0)
… …
1237 self->rows += MAP_EXTEND_Y; 1868 self->rows += MAP_EXTEND_Y;
1238 self->y += MAP_EXTEND_Y; 1869 self->y += MAP_EXTEND_Y;
1239 } 1870 }
1240} 1871}
1241 1872
1242void 1873SV *
1243map1a_update (CFClient::Map self, SV *data_) 1874map1a_update (DC::Map self, SV *data_, int extmap)
1244 CODE: 1875 CODE:
1245{ 1876{
1246 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1247 uint8_t *data_end = (uint8_t *)SvEND (data_); 1878 uint8_t *data_end = (uint8_t *)SvEND (data_);
1248 mapcell *cell; 1879 mapcell *cell;
1249 int x, y, flags; 1880 int x, y, z, flags;
1881 AV *missing = newAV ();
1882 RETVAL = newRV_noinc ((SV *)missing);
1250 1883
1251 while (data < data_end) 1884 while (data < data_end - 1)
1252 { 1885 {
1253 flags = (data [0] << 8) + data [1]; data += 2; 1886 flags = (data [0] << 8) + data [1]; data += 2;
1254 1887
1255 x = self->x + ((flags >> 10) & 63); 1888 x = self->x + ((flags >> 10) & 63);
1256 y = self->y + ((flags >> 4) & 63); 1889 y = self->y + ((flags >> 4) & 63);
1257 1890
1258 cell = map_get_cell (self, x, y); 1891 cell = map_get_cell (self, x, y);
1259 1892
1260 if (flags & 15) 1893 if (flags & 15)
1261 { 1894 {
1262 if (cell->darkness < 0) 1895 if (!cell->darkness)
1263 { 1896 {
1897 memset (cell, 0, sizeof (*cell));
1264 cell->darkness = 0; 1898 cell->darkness = 256;
1265 cell->face [0] = 0;
1266 cell->face [1] = 0;
1267 cell->face [2] = 0;
1268 } 1899 }
1269 1900
1270 cell->darkness = flags & 8 ? *data++ : 255;
1271
1272 //TODO: don't trust server data to be in-range(!) 1901 //TODO: don't trust server data to be in-range(!)
1273 1902
1274 if (flags & 4) 1903 if (flags & 8)
1275 { 1904 {
1276 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1905 if (extmap)
1906 {
1907 uint8_t ext, cmd;
1908
1909 do
1910 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1;
1919 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 }
1939 while (ext & 0x80);
1940 }
1941 else
1942 cell->darkness = *data++ + 1;
1277 } 1943 }
1278 1944
1945 for (z = 0; z <= 2; ++z)
1279 if (flags & 2) 1946 if (flags & (4 >> z))
1280 { 1947 {
1281 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1948 faceid face = (data [0] << 8) + data [1]; data += 2;
1949 need_facenum (self, face);
1950 cell->tile [z] = self->face2tile [face];
1951
1952 if (cell->tile [z])
1953 {
1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1956 if (!tex->name)
1957 av_push (missing, newSViv (cell->tile [z]));
1958
1959 if (tex->smoothtile)
1960 {
1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1963 if (!smooth->name)
1964 av_push (missing, newSViv (tex->smoothtile));
1965 }
1966 }
1282 } 1967 }
1283
1284 if (flags & 1)
1285 {
1286 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1287 }
1288 } 1968 }
1289 else 1969 else
1290 cell->darkness = -1; 1970 CELL_CLEAR (cell);
1291 } 1971 }
1292} 1972}
1973 OUTPUT:
1974 RETVAL
1293 1975
1294SV * 1976SV *
1295mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1977mapmap (DC::Map self, int x0, int y0, int w, int h)
1296 CODE: 1978 CODE:
1297{ 1979{
1298 int x1, x; 1980 int x1, x;
1299 int y1, y; 1981 int y1, y;
1300 int z; 1982 int z;
… …
1321 { 2003 {
1322 mapcell *cell = row->col + (x - row->c0); 2004 mapcell *cell = row->col + (x - row->c0);
1323 2005
1324 for (z = 0; z <= 0; z++) 2006 for (z = 0; z <= 0; z++)
1325 { 2007 {
1326 mapface face = cell->face [z];
1327
1328 if (face)
1329 {
1330 maptex tex = self->tex [face]; 2008 maptex tex = self->tex [cell->tile [z]];
1331 int a0 = 255 - tex.a; 2009 int a0 = 255 - tex.a;
1332 int a1 = tex.a; 2010 int a1 = tex.a;
1333 2011
1334 r = (r * a0 + tex.r * a1) / 255; 2012 r = (r * a0 + tex.r * a1) / 255;
1335 g = (g * a0 + tex.g * a1) / 255; 2013 g = (g * a0 + tex.g * a1) / 255;
1336 b = (b * a0 + tex.b * a1) / 255; 2014 b = (b * a0 + tex.b * a1) / 255;
1337 a = (a * a0 + tex.a * a1) / 255; 2015 a = (a * a0 + tex.a * a1) / 255;
1338 }
1339 } 2016 }
1340 } 2017 }
1341 2018
1342 *map++ = (r ) 2019 *map++ = (r )
1343 | (g << 8) 2020 | (g << 8)
… …
1350} 2027}
1351 OUTPUT: 2028 OUTPUT:
1352 RETVAL 2029 RETVAL
1353 2030
1354void 2031void
1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1356 CODE: 2033 CODE:
1357{ 2034{
1358 int vx, vy;
1359 int x, y, z; 2035 int x, y, z;
1360 int last_name;
1361 mapface face;
1362 2036
1363 vx = self->x + self->w / 2 - sw / 2 - shift_x; 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1364 vy = self->y + self->h / 2 - sh / 2 - shift_y; 2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2040 smooth_key skey;
2041 int pl_x, pl_y;
2042 maptex pl_tex;
2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden;
1365 2047
1366 /* 2048 pl_tex.name = 0;
1367 int vx = self->vx = self->w >= sw
1368 ? self->x + (self->w - sw) / 2
1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1370 2049
1371 int vy = self->vy = self->h >= sh 2050 // that's current max. sorry.
1372 ? self->y + (self->h - sh) / 2 2051 if (sw > 255) sw = 255;
1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 2052 if (sh > 255) sh = 255;
1374 */
1375 2053
1376 glColor4ub (255, 255, 255, 255); 2054 // clear key, in case of extra padding
2055 memset (&skey, 0, sizeof (skey));
2056
2057 memset (&key, 0, sizeof (key));
2058 key.r = 255;
2059 key.g = 255;
2060 key.b = 255;
2061 key.a = 255;
2062 key.mode = GL_QUADS;
2063 key.format = GL_T2F_V3F;
2064
2065 mx += self->x;
2066 my += self->y;
2067
2068 // first pass: determine smooth_max
2069 // rather ugly, if you ask me
2070 // could also be stored inside mapcell and updated on change
2071 memset (smooth_max, 0, sizeof (smooth_max));
2072
2073 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows)
2075 {
2076 maprow *row = self->row + (y + my);
2077
2078 for (x = 0; x < sw; x++)
2079 if (row->c0 <= x + mx && x + mx < row->c1)
2080 {
2081 mapcell *cell = row->col + (x + mx - row->c0);
2082
2083 smooth_max[x + 1][y + 1] =
2084 MAX (self->tex [cell->tile [0]].smoothlevel,
2085 MAX (self->tex [cell->tile [1]].smoothlevel,
2086 self->tex [cell->tile [2]].smoothlevel));
2087 }
2088 }
1377 2089
1378 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1380 glEnable (GL_TEXTURE_2D);
1381 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1382 2093
1383 glBegin (GL_QUADS); 2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
1384 2096
1385 last_name = 0;
1386
1387 for (z = 0; z < 3; z++) 2097 for (z = 0; z <= 2; z++)
2098 {
2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
2101
1388 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1389 if (0 <= y + vy && y + vy < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1390 { 2104 {
1391 maprow *row = self->row + (y + vy); 2105 maprow *row = self->row + (y + my);
1392 2106
1393 for (x = 0; x < sw; x++) 2107 for (x = 0; x < sw; x++)
1394 if (row->c0 <= x + vx && x + vx < row->c1) 2108 if (row->c0 <= x + mx && x + mx < row->c1)
1395 { 2109 {
1396 mapcell *cell = row->col + (x + vx - row->c0); 2110 mapcell *cell = row->col + (x + mx - row->c0);
1397
1398 face = cell->face [z]; 2111 tileid tile = cell->tile [z];
1399 2112
1400 if (face) 2113 if (tile)
2114 {
2115 maptex tex = self->tex [tile];
2116 int px, py;
2117
2118 if (key.texname != tex.name)
2119 {
2120 self->tex [tile].unused = 0;
2121
2122 if (!tex.name)
2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2124
2125 key.texname = tex.name;
2126 arr = rc_array (rc, &key);
2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
2131
2132 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 {
2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
2137 continue;
2138 }
2139
2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2142 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2144
2145 // update smooth hash
2146 if (tex.smoothtile)
2147 {
2148 skey.tile = tex.smoothtile;
2149 skey.level = tex.smoothlevel;
2150
2151 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
2152
2153 // add bits to current tile and all neighbours. skey.x|y is
2154 // shifted +1|+1 so we always stay positive.
2155
2156 // bits is ___n cccc CCCC bbbb
2157 // n do not draw borders&corners
2158 // c draw these corners, but...
2159 // C ... not these
2160 // b draw these borders
2161
2162 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2163 // ┃· ·· ·┃ ━━
2164
2165 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2166 // ·· ·· ·┏ ┓·
2167
2168 // full tile
2169 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2170
2171 // borders
2172 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2173 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2174 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2175 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2176
2177 // corners
2178 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182 }
2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
2219 }
2220 }
2221 }
2222 }
2223
2224 rc_draw (rc);
2225 rc_clear (rc);
2226
2227 // go through all smoothlevels, lowest to highest, then draw.
2228 // this is basically counting sort
2229 {
2230 int w, b;
2231
2232 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS);
2234 for (w = 0; w < 256 / 32; ++w)
2235 {
2236 uint32_t smask = smooth_level [w];
2237 if (smask)
2238 for (b = 0; b < 32; ++b)
2239 if (smask & (((uint32_t)1) << b))
1401 { 2240 {
1402 maptex tex = self->tex [face]; 2241 int level = (w << 5) | b;
2242 HE *he;
1403 2243
1404 int px = (x + 1) * 32 - tex.w; 2244 hv_iterinit (smooth);
1405 int py = (y + 1) * 32 - tex.h; 2245 while ((he = hv_iternext (smooth)))
1406
1407 if (last_name != tex.name)
1408 { 2246 {
2247 smooth_key *skey = (smooth_key *)HeKEY (he);
2248 IV bits = SvIVX (HeVAL (he));
2249
2250 if (!(bits & 0x1000)
2251 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y])
2253 {
2254 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T;
2256 int py = (((int)skey->y) - 1) * T;
2257 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column
2261
2262 if (tex.name)
2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
2266 if (key.texname != tex.name)
2267 {
2268 self->tex [skey->tile].unused = 0;
2269
1409 glEnd (); 2270 glEnd ();
1410 last_name = tex.name;
1411 glBindTexture (GL_TEXTURE_2D, last_name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1412 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2273 }
2274
2275 if (border)
2276 {
2277 float ox = border * dx;
2278
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2283 }
2284
2285 if (corner)
2286 {
2287 float ox = corner * dx;
2288
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2293 }
2294 }
2295 }
1413 } 2296 }
1414
1415 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1416 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1417 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1418 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1419 } 2297 }
1420 }
1421 } 2298 }
1422 2299
1423 glEnd (); 2300 glEnd ();
1424
1425 glDisable (GL_TEXTURE_2D); 2301 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1;
2303 }
2304
2305 hv_clear (smooth);
2306 }
2307
2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
2313
2314 key.texname = tex.name;
2315 arr = rc_array (rc, &key);
2316
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2321
2322 rc_draw (rc);
2323 }
2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
1426 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
1427} 2329 rc_free (rc);
2330 rc_free (rc_ov);
1428 2331
2332 // top layer: overlays such as the health bar
2333 for (y = 0; y < sh; y++)
2334 if (0 <= y + my && y + my < self->rows)
2335 {
2336 maprow *row = self->row + (y + my);
2337
2338 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1)
2340 {
2341 mapcell *cell = row->col + (x + mx - row->c0);
2342
2343 int px = x * T;
2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
2351
2352 if (cell->stat_hp)
2353 {
2354 int width = cell->stat_width * T;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2356
2357 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py);
2360
2361 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2362 glRectf (px + 2,
2363 py - thick - 1,
2364 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2365 }
2366 }
2367 }
2368}
2369
1429void 2370void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 2371draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE: 2372 CODE:
1432{ 2373{
1433 static float color[16][3] = { 2374 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F }, 2375 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F }, 2376 { 1.00F, 1.00F, 1.00F },
… …
1454 }; 2395 };
1455 2396
1456 int x, y; 2397 int x, y;
1457 2398
1458 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
1459 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1460 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
1461 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1462 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
1463 2410
1464 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
1471 float *c = color [m & 15]; 2418 float *c = color [m & 15];
1472 2419
1473 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
1474 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
1475 2422
1476 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
1477 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1478 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1479 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1480 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1481 } 2428 }
… …
1485 glDisable (GL_BLEND); 2432 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D); 2433 glDisable (GL_TEXTURE_2D);
1487} 2434}
1488 2435
1489void 2436void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2437fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1491 PPCODE: 2438 PPCODE:
1492{ 2439{
1493 int vx, vy;
1494 int x, y; 2440 int x, y;
2441 int sw1 = sw + 2;
2442 int sh1 = sh + 2;
2443 int sh3 = sh * 3;
1495 int sw4 = (sw + 3) & ~3; 2444 int sw34 = (sw * 3 + 3) & ~3;
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1498 2448
1499 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv); 2449 SvPOK_only (darkness3_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
1502 2451
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2452 mx += self->x - 1;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2453 my += self->y - 1;
1505 2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456
1506 for (y = 0; y < sh; y++) 2457 for (y = 0; y < sh1; y++)
1507 if (0 <= y + vy && y + vy < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
1508 { 2459 {
1509 maprow *row = self->row + (y + vy); 2460 maprow *row = self->row + (y + my);
1510 2461
1511 for (x = 0; x < sw; x++) 2462 for (x = 0; x < sw1; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1) 2463 if (row->c0 <= x + mx && x + mx < row->c1)
1513 { 2464 {
1514 mapcell *cell = row->col + (x + vx - row->c0); 2465 mapcell *cell = row->col + (x + mx - row->c0);
1515 2466
1516 darkness[y * sw4 + x] = cell->darkness < 0 2467 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1)
1517 ? 255 - FOW_DARKNESS 2469 : 255 - FOW_DARKNESS;
1518 : 255 - cell->darkness;
1519 } 2470 }
1520 } 2471 }
1521 2472
2473 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x)
2475 {
2476 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2477 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2478 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2479 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2480 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2481 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2482 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2483 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2484 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2485
2486 uint8_t r11 = (d11 + d21 + d12) / 3;
2487 uint8_t r21 = d21;
2488 uint8_t r31 = (d21 + d31 + d32) / 3;
2489
2490 uint8_t r12 = d12;
2491 uint8_t r22 = d22;
2492 uint8_t r32 = d32;
2493
2494 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3;
2497
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2502 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2507 }
2508
2509 free (darkness1);
2510
1522 EXTEND (SP, 3); 2511 EXTEND (SP, 3);
1523 PUSHs (sv_2mortal (newSViv (sw4))); 2512 PUSHs (sv_2mortal (newSViv (sw34)));
1524 PUSHs (sv_2mortal (newSViv (sh))); 2513 PUSHs (sv_2mortal (newSViv (sh3)));
1525 PUSHs (darkness_sv); 2514 PUSHs (darkness3_sv);
1526} 2515}
1527 2516
1528SV * 2517SV *
1529get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2518get_rect (DC::Map self, int x0, int y0, int w, int h)
1530 CODE: 2519 CODE:
1531{ 2520{
1532 int x, y, x1, y1; 2521 int x, y, x1, y1;
1533 SV *data_sv = newSV (w * h * 7 + 5); 2522 SV *data_sv = newSV (w * h * 7 + 5);
1534 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2523 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1559 if (row && row->c0 <= x && x < row->c1) 2548 if (row && row->c0 <= x && x < row->c1)
1560 { 2549 {
1561 mapcell *cell = row->col + (x - row->c0); 2550 mapcell *cell = row->col + (x - row->c0);
1562 uint8_t flags = 0; 2551 uint8_t flags = 0;
1563 2552
1564 if (cell->face [0]) flags |= 1; 2553 if (cell->tile [0]) flags |= 1;
1565 if (cell->face [1]) flags |= 2; 2554 if (cell->tile [1]) flags |= 2;
1566 if (cell->face [2]) flags |= 4; 2555 if (cell->tile [2]) flags |= 4;
1567 2556
1568 *data++ = flags; 2557 *data++ = flags;
1569 2558
1570 if (flags & 1) 2559 if (flags & 1)
1571 { 2560 {
2561 tileid tile = cell->tile [0];
1572 *data++ = cell->face [0] >> 8; 2562 *data++ = tile >> 8;
1573 *data++ = cell->face [0]; 2563 *data++ = tile;
1574 } 2564 }
1575 2565
1576 if (flags & 2) 2566 if (flags & 2)
1577 { 2567 {
2568 tileid tile = cell->tile [1];
1578 *data++ = cell->face [1] >> 8; 2569 *data++ = tile >> 8;
1579 *data++ = cell->face [1]; 2570 *data++ = tile;
1580 } 2571 }
1581 2572
1582 if (flags & 4) 2573 if (flags & 4)
1583 { 2574 {
2575 tileid tile = cell->tile [2];
1584 *data++ = cell->face [2] >> 8; 2576 *data++ = tile >> 8;
1585 *data++ = cell->face [2]; 2577 *data++ = tile;
1586 } 2578 }
1587 } 2579 }
1588 else 2580 else
1589 *data++ = 0; 2581 *data++ = 0;
1590 } 2582 }
1591 } 2583 }
1592 2584
2585 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 {
1593 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
1594 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
1595 RETVAL = data_sv; 2592 RETVAL = data_sv;
1596} 2593}
1597 OUTPUT: 2594 OUTPUT:
1598 RETVAL 2595 RETVAL
1599 2596
1600void 2597void
1601set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1602 PPCODE: 2599 PPCODE:
1603{ 2600{
1604 int x, y, z; 2601 int x, y, z;
1605 int w, h; 2602 int w, h;
1606 int x1, y1; 2603 int x1, y1;
2604 STRLEN len;
2605 uint8_t *data, *end;
2606
2607 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv);
2610 end = data + len + 8;
2611
2612 if (len < 5)
2613 XSRETURN_EMPTY;
1607 2614
1608 if (*data++ != 0) 2615 if (*data++ != 0)
1609 return; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
1610 2617
1611 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
1612 h = *data++ << 8; h |= *data++; 2619 h = *data++ << 8; h |= *data++;
1613 2620
1614 // we need to do this 'cause we don't keep an absolute coord system for rows 2621 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1626 { 2633 {
1627 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
1628 2635
1629 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
1630 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
1631 uint8_t flags = *data++; 2643 flags = *data++;
1632 2644
1633 if (flags) 2645 if (flags)
1634 { 2646 {
1635 mapface face[3] = { 0, 0, 0 };
1636
1637 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2648 tileid tile[3] = { 0, 0, 0 };
1638 2649
1639 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2650 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1640 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1641 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1642 2653
1643 if (cell->darkness <= 0) 2654 if (cell->darkness == 0)
1644 { 2655 {
1645 cell->darkness = -1; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
1646 2658
1647 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
1648 { 2660 {
1649 cell->face[z] = face[z]; 2661 tileid t = tile [z];
1650 2662
1651 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2664 {
1652 XPUSHs (sv_2mortal (newSViv (face[z]))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2666 need_texid (self, t);
2667 }
2668
2669 cell->tile [z] = t;
1653 } 2670 }
1654 } 2671 }
1655 } 2672 }
1656 } 2673 }
1657 } 2674 }
1658} 2675}
1659 2676
1660MODULE = CFClient PACKAGE = CFClient::MixChunk 2677MODULE = Deliantra::Client PACKAGE = DC::RW
1661 2678
1662CFClient::MixChunk 2679DC::RW
1663new_from_file (SV *class, char *path) 2680new (SV *class, SV *data_sv)
1664 CODE: 2681 CODE:
1665 RETVAL = Mix_LoadWAV (path); 2682{
2683 STRLEN datalen;
2684 char *data = SvPVbyte (data_sv, datalen);
2685
2686 RETVAL = SDL_RWFromConstMem (data, datalen);
2687}
1666 OUTPUT: 2688 OUTPUT:
1667 RETVAL 2689 RETVAL
1668 2690
2691DC::RW
2692new_from_file (SV *class, const char *path, const char *mode = "rb")
2693 CODE:
2694 RETVAL = SDL_RWFromFile (path, mode);
2695 OUTPUT:
2696 RETVAL
2697
2698# fails on win32:
2699# dc.xs(2268) : error C2059: syntax error : '('
1669void 2700#void
2701#close (DC::RW self)
2702# CODE:
2703# (self->(close)) (self);
2704
2705MODULE = Deliantra::Client PACKAGE = DC::Channel
2706
2707PROTOTYPES: DISABLE
2708
2709DC::Channel
2710find ()
2711 CODE:
2712{
2713 RETVAL = Mix_GroupAvailable (-1);
2714
2715 if (RETVAL < 0)
2716 {
2717 RETVAL = Mix_GroupOldest (-1);
2718
2719 if (RETVAL < 0)
2720 XSRETURN_UNDEF;
2721
2722 Mix_HaltChannel (RETVAL);
2723 }
2724
2725 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128);
2727}
2728 OUTPUT:
2729 RETVAL
2730
2731void
2732halt (DC::Channel self)
2733 CODE:
2734 Mix_HaltChannel (self);
2735
2736void
2737expire (DC::Channel self, int ticks = -1)
2738 CODE:
2739 Mix_ExpireChannel (self, ticks);
2740
2741void
2742fade_out (DC::Channel self, int ticks = -1)
2743 CODE:
2744 Mix_FadeOutChannel (self, ticks);
2745
2746int
2747volume (DC::Channel self, int volume)
2748 CODE:
2749 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2750 OUTPUT:
2751 RETVAL
2752
2753void
2754unregister_all_effects (DC::Channel self)
2755 CODE:
2756 Mix_UnregisterAllEffects (self);
2757
2758void
2759set_panning (DC::Channel self, int left, int right)
2760 CODE:
2761 left = CLAMP (left , 0, 255);
2762 right = CLAMP (right, 0, 255);
2763 Mix_SetPanning (self, left, right);
2764
2765void
2766set_distance (DC::Channel self, int distance)
2767 CODE:
2768 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2769
2770void
2771set_position (DC::Channel self, int angle, int distance)
2772 CODE:
2773
2774void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE:
2777{
2778 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781}
2782
2783void
2784set_reverse_stereo (DC::Channel self, int flip)
2785 CODE:
2786 Mix_SetReverseStereo (self, flip);
2787
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789
2790PROTOTYPES: DISABLE
2791
2792DC::MixChunk
2793new (SV *class, DC::RW rwops)
2794 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT:
2797 RETVAL
2798
2799void
1670DESTROY (CFClient::MixChunk self) 2800DESTROY (DC::MixChunk self)
1671 CODE: 2801 CODE:
1672 Mix_FreeChunk (self); 2802 Mix_FreeChunk (self);
1673 2803
1674int 2804int
1675volume (CFClient::MixChunk self, int volume = -1) 2805volume (DC::MixChunk self, int volume = -1)
1676 CODE: 2806 CODE:
2807 if (items > 1)
2808 volume = CLAMP (volume, 0, 128);
1677 RETVAL = Mix_VolumeChunk (self, volume); 2809 RETVAL = Mix_VolumeChunk (self, volume);
1678 OUTPUT: 2810 OUTPUT:
1679 RETVAL 2811 RETVAL
1680 2812
1681int 2813DC::Channel
1682play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2814play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1683 CODE: 2815 CODE:
2816{
1684 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2817 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2818
2819 if (RETVAL < 0)
2820 XSRETURN_UNDEF;
2821
2822 if (channel < 0)
2823 {
2824 Mix_UnregisterAllEffects (RETVAL);
2825 Mix_Volume (RETVAL, 128);
2826 }
2827}
1685 OUTPUT: 2828 OUTPUT:
1686 RETVAL 2829 RETVAL
1687 2830
1688MODULE = CFClient PACKAGE = CFClient::MixMusic 2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1689 2832
1690int 2833int
1691volume (int volume = -1) 2834volume (int volume = -1)
2835 PROTOTYPE: ;$
1692 CODE: 2836 CODE:
2837 if (items > 0)
2838 volume = CLAMP (volume, 0, 128);
1693 RETVAL = Mix_VolumeMusic (volume); 2839 RETVAL = Mix_VolumeMusic (volume);
1694 OUTPUT: 2840 OUTPUT:
1695 RETVAL 2841 RETVAL
1696 2842
1697CFClient::MixMusic 2843void
1698new_from_file (SV *class, char *path) 2844fade_out (int ms)
1699 CODE: 2845 CODE:
2846 Mix_FadeOutMusic (ms);
2847
2848void
2849halt ()
2850 CODE:
2851 Mix_HaltMusic ();
2852
2853DC::MixMusic
2854new (SV *class, DC::RW rwops)
2855 CODE:
1700 RETVAL = Mix_LoadMUS (path); 2856 RETVAL = Mix_LoadMUS_RW (rwops);
1701 OUTPUT: 2857 OUTPUT:
1702 RETVAL 2858 RETVAL
1703 2859
1704void 2860void
1705DESTROY (CFClient::MixMusic self) 2861DESTROY (DC::MixMusic self)
1706 CODE: 2862 CODE:
1707 Mix_FreeMusic (self); 2863 Mix_FreeMusic (self);
1708 2864
1709int 2865int
1710play (CFClient::MixMusic self, int loops = -1) 2866play (DC::MixMusic self, int loops = -1)
1711 CODE: 2867 CODE:
1712 RETVAL = Mix_PlayMusic (self, loops); 2868 RETVAL = Mix_PlayMusic (self, loops);
1713 OUTPUT: 2869 OUTPUT:
1714 RETVAL 2870 RETVAL
1715 2871
2872void
2873fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2874 CODE:
2875 Mix_FadeInMusicPos (self, loops, ms, position);
2876
1716MODULE = CFClient PACKAGE = CFClient::OpenGL 2877MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2878
2879PROTOTYPES: ENABLE
1717 2880
1718BOOT: 2881BOOT:
1719{ 2882{
1720 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2883 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1721 static const struct { 2884 static const struct {
1722 const char *name; 2885 const char *name;
1723 IV iv; 2886 IV iv;
1724 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
1725# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2889 const_iv (GL_VENDOR),
2890 const_iv (GL_VERSION),
2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
1726 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
1727 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
1728 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
1729 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
1730 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
1734 const_iv (GL_ALPHA_TEST), 2901 const_iv (GL_ALPHA_TEST),
1735 const_iv (GL_NORMALIZE), 2902 const_iv (GL_NORMALIZE),
1736 const_iv (GL_RESCALE_NORMAL), 2903 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT), 2904 const_iv (GL_FRONT),
1738 const_iv (GL_BACK), 2905 const_iv (GL_BACK),
2906 const_iv (GL_AUX0),
1739 const_iv (GL_AND), 2907 const_iv (GL_AND),
1740 const_iv (GL_ONE), 2908 const_iv (GL_ONE),
1741 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
1742 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
1743 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
1744 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1745 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
1746 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
1747 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
1748 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
1749 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
1750 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
1756 const_iv (GL_INTENSITY), 2928 const_iv (GL_INTENSITY),
1757 const_iv (GL_LUMINANCE), 2929 const_iv (GL_LUMINANCE),
1758 const_iv (GL_LUMINANCE_ALPHA), 2930 const_iv (GL_LUMINANCE_ALPHA),
1759 const_iv (GL_FLOAT), 2931 const_iv (GL_FLOAT),
1760 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2932 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2933 const_iv (GL_COMPRESSED_ALPHA_ARB),
2934 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2935 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2936 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2937 const_iv (GL_COMPRESSED_RGB_ARB),
2938 const_iv (GL_COMPRESSED_RGBA_ARB),
1761 const_iv (GL_COMPILE), 2939 const_iv (GL_COMPILE),
2940 const_iv (GL_PROXY_TEXTURE_1D),
2941 const_iv (GL_PROXY_TEXTURE_2D),
1762 const_iv (GL_TEXTURE_1D), 2942 const_iv (GL_TEXTURE_1D),
1763 const_iv (GL_TEXTURE_2D), 2943 const_iv (GL_TEXTURE_2D),
1764 const_iv (GL_TEXTURE_ENV), 2944 const_iv (GL_TEXTURE_ENV),
1765 const_iv (GL_TEXTURE_MAG_FILTER), 2945 const_iv (GL_TEXTURE_MAG_FILTER),
1766 const_iv (GL_TEXTURE_MIN_FILTER), 2946 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1787 const_iv (GL_COLOR_LOGIC_OP), 2967 const_iv (GL_COLOR_LOGIC_OP),
1788 const_iv (GL_SEPARABLE_2D), 2968 const_iv (GL_SEPARABLE_2D),
1789 const_iv (GL_CONVOLUTION_2D), 2969 const_iv (GL_CONVOLUTION_2D),
1790 const_iv (GL_CONVOLUTION_BORDER_MODE), 2970 const_iv (GL_CONVOLUTION_BORDER_MODE),
1791 const_iv (GL_CONSTANT_BORDER), 2971 const_iv (GL_CONSTANT_BORDER),
2972 const_iv (GL_POINTS),
1792 const_iv (GL_LINES), 2973 const_iv (GL_LINES),
2974 const_iv (GL_LINE_STRIP),
1793 const_iv (GL_LINE_LOOP), 2975 const_iv (GL_LINE_LOOP),
1794 const_iv (GL_QUADS), 2976 const_iv (GL_QUADS),
1795 const_iv (GL_QUAD_STRIP), 2977 const_iv (GL_QUAD_STRIP),
1796 const_iv (GL_TRIANGLES), 2978 const_iv (GL_TRIANGLES),
1797 const_iv (GL_TRIANGLE_STRIP), 2979 const_iv (GL_TRIANGLE_STRIP),
1798 const_iv (GL_TRIANGLE_FAN), 2980 const_iv (GL_TRIANGLE_FAN),
2981 const_iv (GL_POLYGON),
1799 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2982 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2983 const_iv (GL_POINT_SMOOTH_HINT),
2984 const_iv (GL_LINE_SMOOTH_HINT),
2985 const_iv (GL_POLYGON_SMOOTH_HINT),
2986 const_iv (GL_GENERATE_MIPMAP_HINT),
2987 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1800 const_iv (GL_FASTEST), 2988 const_iv (GL_FASTEST),
2989 const_iv (GL_DONT_CARE),
2990 const_iv (GL_NICEST),
1801 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
1802 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
1803 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
1804 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
1805# undef const_iv 2998# undef const_iv
1806 }; 2999 };
1807 3000
1808 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1809 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
3003
3004 texture_av = newAV ();
3005 AvREAL_off (texture_av);
1810} 3006}
3007
3008void
3009disable_GL_EXT_blend_func_separate ()
3010 CODE:
3011 gl.BlendFuncSeparate = 0;
3012 gl.BlendFuncSeparateEXT = 0;
3013
3014void
3015apple_nvidia_bug (int enable)
1811 3016
1812char * 3017char *
1813gl_vendor () 3018gl_vendor ()
1814 CODE: 3019 CODE:
1815 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1828 CODE: 3033 CODE:
1829 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3034 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1830 OUTPUT: 3035 OUTPUT:
1831 RETVAL 3036 RETVAL
1832 3037
3038const char *glGetString (GLenum pname)
3039
3040GLint glGetInteger (GLenum pname)
3041 CODE:
3042 glGetIntegerv (pname, &RETVAL);
3043 OUTPUT:
3044 RETVAL
3045
3046GLdouble glGetDouble (GLenum pname)
3047 CODE:
3048 glGetDoublev (pname, &RETVAL);
3049 OUTPUT:
3050 RETVAL
3051
1833int glGetError () 3052int glGetError ()
1834 3053
1835void glFinish () 3054void glFinish ()
1836 3055
1837void glClear (int mask) 3056void glClear (int mask)
… …
1851 3070
1852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1853 CODE: 3072 CODE:
1854 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
1855 3074
3075# void glBlendEquation (int se)
3076
1856void glDepthMask (int flag) 3077void glDepthMask (int flag)
1857 3078
1858void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
1859 3080
1860void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
1874# near_ and far_ are due to microsofts buggy "c" compiler 3095# near_ and far_ are due to microsofts buggy "c" compiler
1875void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3096void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1876 3097
1877# near_ and far_ are due to microsofts buggy "c" compiler 3098# near_ and far_ are due to microsofts buggy "c" compiler
1878void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3099void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3100
3101PROTOTYPES: DISABLE
1879 3102
1880void glViewport (int x, int y, int width, int height) 3103void glViewport (int x, int y, int width, int height)
1881 3104
1882void glScissor (int x, int y, int width, int height) 3105void glScissor (int x, int y, int width, int height)
1883 3106
… …
1891 3114
1892void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
1893 CODE: 3116 CODE:
1894 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
1895 3118
1896void glBegin (int mode)
1897
1898void glEnd ()
1899
1900void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
1901 PROTOTYPE: @ 3120 PROTOTYPE: @
1902 ALIAS: 3121 ALIAS:
1903 glColor_premultiply = 1 3122 glColor_premultiply = 1
1904 CODE: 3123 CODE:
1905 if (ix) 3124 if (ix)
1906 { 3125 {
1907 r *= a; 3126 r *= a;
1908 g *= a; 3127 g *= a;
1909 b *= a; 3128 b *= a;
1910 } 3129 }
1911 // microsoft visual "c" rounds instead of truncating... 3130 // microsoft visual "c" rounds instead of truncating...
1912 glColor4ub (MIN ((int)(r * 256.f), 255), 3131 glColor4f (r, g, b, a);
1913 MIN ((int)(g * 256.f), 255),
1914 MIN ((int)(b * 256.f), 255),
1915 MIN ((int)(a * 256.f), 255));
1916
1917void glInterleavedArrays (int format, int stride, char *data)
1918
1919void glDrawElements (int mode, int count, int type, char *indices)
1920
1921# 1.2 void glDrawRangeElements (int mode, int start, int end
1922 3132
1923void glRasterPos (float x, float y, float z = 0.) 3133void glRasterPos (float x, float y, float z = 0.)
1924 CODE: 3134 CODE:
1925 glRasterPos3f (0, 0, z); 3135 glRasterPos3f (0, 0, z);
1926 glBitmap (0, 0, 0, 0, x, y, 0); 3136 glBitmap (0, 0, 0, 0, x, y, 0);
… …
1931 3141
1932void glTexCoord (float s, float t) 3142void glTexCoord (float s, float t)
1933 CODE: 3143 CODE:
1934 glTexCoord2f (s, t); 3144 glTexCoord2f (s, t);
1935 3145
3146void glRect (float x1, float y1, float x2, float y2)
3147 CODE:
3148 glRectf (x1, y1, x2, y2);
3149
3150void glRect_lineloop (float x1, float y1, float x2, float y2)
3151 CODE:
3152 glBegin (GL_LINE_LOOP);
3153 glVertex2f (x1, y1);
3154 glVertex2f (x2, y1);
3155 glVertex2f (x2, y2);
3156 glVertex2f (x1, y2);
3157 glEnd ();
3158
3159PROTOTYPES: ENABLE
3160
3161void glBegin (int mode)
3162
3163void glEnd ()
3164
3165void glPointSize (GLfloat size)
3166
3167void glLineWidth (GLfloat width)
3168
3169void glInterleavedArrays (int format, int stride, char *data)
3170
3171void glDrawElements (int mode, int count, int type, char *indices)
3172
3173# 1.2 void glDrawRangeElements (int mode, int start, int end
3174
1936void glTexEnv (int target, int pname, float param) 3175void glTexEnv (int target, int pname, float param)
1937 CODE: 3176 CODE:
1938 glTexEnvf (target, pname, param); 3177 glTexEnvf (target, pname, param);
1939 3178
1940void glTexParameter (int target, int pname, float param) 3179void glTexParameter (int target, int pname, float param)
… …
1956void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3195void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1957 CODE: 3196 CODE:
1958 if (gl.SeparableFilter2D) 3197 if (gl.SeparableFilter2D)
1959 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3198 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1960 3199
1961void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3200void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
1962 3201
1963void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3202void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1964 3203
1965void glDrawPixels (int width, int height, int format, int type, char *pixels) 3204void glDrawPixels (int width, int height, int format, int type, char *pixels)
3205
3206void glPixelZoom (float x, float y)
1966 3207
1967void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3208void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1968 3209
1969int glGenTexture () 3210int glGenTexture ()
1970 CODE: 3211 CODE:
1971{ 3212 RETVAL = gen_texture ();
1972 GLuint name;
1973 glGenTextures (1, &name);
1974 RETVAL = name;
1975}
1976 OUTPUT: 3213 OUTPUT:
1977 RETVAL 3214 RETVAL
1978 3215
1979void glDeleteTexture (int name) 3216void glDeleteTexture (int name)
1980 CODE: 3217 CODE:
1981{
1982 GLuint name_ = name;
1983 glDeleteTextures (1, &name_); 3218 del_texture (name);
1984} 3219
1985
1986int glGenList () 3220int glGenList ()
1987 CODE: 3221 CODE:
1988 RETVAL = glGenLists (1); 3222 RETVAL = glGenLists (1);
1989 OUTPUT: 3223 OUTPUT:
1990 RETVAL 3224 RETVAL
… …
1997 3231
1998void glEndList () 3232void glEndList ()
1999 3233
2000void glCallList (int list) 3234void glCallList (int list)
2001 3235
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2002 3237
3238PROTOTYPES: DISABLE
3239
3240void
3241find_widget (SV *self, NV x, NV y)
3242 PPCODE:
3243{
3244 if (within_widget (self, x, y))
3245 XPUSHs (self);
3246}
3247
3248BOOT:
3249{
3250 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3251
3252 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3253 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3254 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3255 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3256}
3257
3258void
3259draw (SV *self)
3260 CODE:
3261{
3262 HV *hv;
3263 SV **svp;
3264 NV x, y, w, h;
3265 SV *draw_x_sv = GvSV (draw_x_gv);
3266 SV *draw_y_sv = GvSV (draw_y_gv);
3267 SV *draw_w_sv = GvSV (draw_w_gv);
3268 SV *draw_h_sv = GvSV (draw_h_gv);
3269 double draw_x, draw_y;
3270
3271 if (!SvROK (self))
3272 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3273
3274 hv = (HV *)SvRV (self);
3275
3276 if (SvTYPE (hv) != SVt_PVHV)
3277 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3278
3279 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3280 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3281
3282 if (!h || !w)
3283 XSRETURN_EMPTY;
3284
3285 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3286 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3287
3288 draw_x = SvNV (draw_x_sv) + x;
3289 draw_y = SvNV (draw_y_sv) + y;
3290
3291 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3292 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3293 XSRETURN_EMPTY;
3294
3295 sv_setnv (draw_x_sv, draw_x);
3296 sv_setnv (draw_y_sv, draw_y);
3297
3298 glPushMatrix ();
3299 glTranslated (x, y, 0);
3300
3301 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3302 {
3303 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3304
3305 if (svp && SvTRUE (*svp))
3306 {
3307 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3308 glEnable (GL_BLEND);
3309 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3310 glBegin (GL_QUADS);
3311 glVertex2f (0, 0);
3312 glVertex2f (w, 0);
3313 glVertex2f (w, h);
3314 glVertex2f (0, h);
3315 glEnd ();
3316 glDisable (GL_BLEND);
3317 }
3318 }
3319#if 0
3320 // draw borders, for debugging
3321 glPushMatrix ();
3322 glColor4f (1., 1., 0., 1.);
3323 glTranslatef (.5, .5, 0.);
3324 glBegin (GL_LINE_LOOP);
3325 glVertex2f (0 , 0);
3326 glVertex2f (w - 1, 0);
3327 glVertex2f (w - 1, h - 1);
3328 glVertex2f (0 , h - 1);
3329 glEnd ();
3330 glPopMatrix ();
3331#endif
3332 PUSHMARK (SP);
3333 XPUSHs (self);
3334 PUTBACK;
3335 call_method ("_draw", G_VOID | G_DISCARD);
3336 SPAGAIN;
3337
3338 glPopMatrix ();
3339
3340 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3341 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3342}
3343

Diff Legend

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