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.202 by root, Tue Jul 17 18:34:24 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 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
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
… …
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
43 61
44#ifndef _WIN32 62#ifndef _WIN32
45# include <sys/types.h> 63# include <sys/types.h>
46# include <sys/socket.h> 64# include <sys/socket.h>
47# include <netinet/in.h> 65# include <netinet/in.h>
48# include <netinet/tcp.h> 66# include <netinet/tcp.h>
49# include <inttypes.h> 67# include <inttypes.h>
50#endif 68#endif
51 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 80
54#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
55 82
56#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
58 85
59#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
60 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
61#if 0 91#if 1
62# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else 93#else
64# define PARACHUTE 0 94# define PARACHUTE 0
65#endif 95#endif
66 96
… …
107 av_push (texture_av, (SV *)(size_t)name); 137 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 138 glDeleteTextures (1, &name);
109} 139}
110 140
111#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
112 143
113#include "pango-font.c" 144#include "pango-font.c"
114#include "pango-fontmap.c" 145#include "pango-fontmap.c"
115#include "pango-render.c" 146#include "pango-render.c"
116 147
148typedef IV DC__Channel;
149typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
119 152
120typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
121 154
122static int 155static int
123shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
124{ 157{
125 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
… …
139 172
140typedef struct cf_layout { 173typedef struct cf_layout {
141 PangoLayout *pl; 174 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
143 int base_height; 176 int base_height;
144 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
145} *CFPlus__Layout; 179} *DC__Layout;
146 180
147static CFPlus__Font default_font; 181static DC__Font default_font;
148static PangoContext *opengl_context; 182static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
150 184
151static void 185static void
152substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
… …
157#endif 191#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 193}
160 194
161static void 195static void
162layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
163{ 197{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
166 */ 200 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
168 202
169 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 205
172 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
173} 207}
174 208
175static void 209static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 211{
178 PangoRectangle rect; 212 PangoRectangle rect;
179 213
180 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
… …
192 226
193typedef uint16_t tileid; 227typedef uint16_t tileid;
194typedef uint16_t faceid; 228typedef uint16_t faceid;
195 229
196typedef struct { 230typedef struct {
197 int name; 231 GLuint name;
198 int w, h; 232 int w, h;
199 float s, t; 233 float s, t;
200 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
201 tileid smoothtile; 235 tileid smoothtile;
202 uint8_t smoothlevel; 236 uint8_t smoothlevel;
… …
220 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
222 256
223 int32_t rows; 257 int32_t rows;
224 maprow *row; 258 maprow *row;
225} *CFPlus__Map; 259} *DC__Map;
226 260
227static char * 261static char *
228prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
229{ 263{
230 char *p; 264 char *p;
… …
268 self->texs *= 2; 302 self->texs *= 2;
269 } 303 }
270} 304}
271 305
272static maprow * 306static maprow *
273map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
274{ 308{
275 if (0 > y) 309 if (0 > y)
276 { 310 {
277 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
… …
316 350
317 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
318} 352}
319 353
320static mapcell * 354static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
322{ 356{
323 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
324} 358}
325 359
326static void 360static void
327map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
328{ 362{
329 int r; 363 int r;
330 364
331 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
… …
340 self->row = 0; 374 self->row = 0;
341 self->rows = 0; 375 self->rows = 0;
342} 376}
343 377
344static void 378static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 379map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 380{
347 int x, y; 381 int x, y;
348 maprow *row; 382 maprow *row;
349 mapcell *cell; 383 mapcell *cell;
350 384
… …
429 n |= n >> 16; 463 n |= n >> 16;
430 464
431 return n + 1; 465 return n + 1;
432} 466}
433 467
468static unsigned int
469popcount (unsigned int n)
470{
471 n -= (n >> 1) & 0x55555555U;
472 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
473 n = ((n >> 4) + n) & 0x0f0f0f0fU;
474 n *= 0x01010101U;
475
476 return n >> 24;
477}
478
434/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
437 482
438MODULE = CFPlus PACKAGE = CFPlus 483/******************************************************************************/
484
485static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
486static GV *hover_gv;
487
488static int
489within_widget (SV *widget, NV x, NV y)
490{
491 HV *self;
492 SV **svp;
493 NV wx, ww, wy, wh;
494
495 if (!SvROK (widget))
496 return 0;
497
498 self = (HV *)SvRV (widget);
499
500 if (SvTYPE (self) != SVt_PVHV)
501 return 0;
502
503 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
504 if (y < wy)
505 return 0;
506
507 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
508 if (y >= wy + wh)
509 return 0;
510
511 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
512 if (x < wx)
513 return 0;
514
515 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
516 if (x >= wx + ww)
517 return 0;
518
519 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
520 if (!svp || !SvTRUE (*svp))
521 return 0;
522
523 return 1;
524}
525
526MODULE = Deliantra::Client PACKAGE = DC
439 527
440PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
441 529
442BOOT: 530BOOT:
443{ 531{
444 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 533 static const struct {
446 const char *name; 534 const char *name;
447 IV iv; 535 IV iv;
448 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
… …
471 559
472 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
475 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
557# undef const_iv 649# undef const_iv
558 }; 650 };
559 651
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
579 671
580NV floor (NV x) 672NV floor (NV x)
581 673
582NV ceil (NV x) 674NV ceil (NV x)
583 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
584void 680void
585pango_init () 681pango_init ()
586 CODE: 682 CODE:
587{ 683{
588 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
591} 692}
592 693
593char * 694char *
594SDL_GetError () 695SDL_GetError ()
595 696
… …
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 729
629 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
630 while (*m) 731 while (*m)
631 { 732 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
633 { 734 {
634 AV *av = newAV (); 735 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
… …
661 762
662 if (RETVAL) 763 if (RETVAL)
663 { 764 {
664 av_clear (texture_av); 765 av_clear (texture_av);
665 766
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 769#include "glfunc.h"
669#undef GL_FUNC 770#undef GL_FUNC
670 } 771 }
671} 772}
… …
678char * 779char *
679SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
680 781
681int 782int
682SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
683 787
684void 788void
685poll_events () 789poll_events ()
686 PPCODE: 790 PPCODE:
687{ 791{
… …
697 { 801 {
698 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
699 case SDL_KEYUP: 803 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 809 break;
706 810
707 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 830 x = ev.motion.x;
727 y = ev.motion.y; 831 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 833 }
730 834
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 841 }
738 break; 842 break;
739 843
740 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 847
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 858 break;
755 } 859 }
756 860
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 862 }
759} 863}
760 864
761int 865int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 867 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 869 Mix_ChannelFinished (channel_finished);
766 870
767void 871void
872Mix_QuerySpec ()
873 PPCODE:
874{
875 int freq, channels;
876 Uint16 format;
877
878 if (Mix_QuerySpec (&freq, &format, &channels))
879 {
880 EXTEND (SP, 3);
881 PUSHs (sv_2mortal (newSViv (freq)));
882 PUSHs (sv_2mortal (newSViv (format)));
883 PUSHs (sv_2mortal (newSViv (channels)));
884 }
885}
886
887void
768Mix_CloseAudio () 888Mix_CloseAudio ()
769 889
770int 890int
771Mix_AllocateChannels (int numchans = -1) 891Mix_AllocateChannels (int numchans = -1)
892
893const char *
894Mix_GetError ()
772 895
773void 896void
774lowdelay (int fd, int val = 1) 897lowdelay (int fd, int val = 1)
775 CODE: 898 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 899 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 925 }
803 } 926 }
804#endif 927#endif
805} 928}
806 929
807void 930int
808add_font (char *file) 931add_font (char *file)
809 CODE: 932 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
811 936
812void 937void
813load_image_inline (SV *image_) 938load_image_inline (SV *image_)
814 ALIAS: 939 ALIAS:
815 load_image_file = 1 940 load_image_file = 1
… …
818 STRLEN image_len; 943 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 944 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 945 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 946 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 947 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 948 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 949 : SDL_RWFromConstMem (image, image_len);
825 950
826 if (!rw) 951 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 952 croak ("load_image: %s", SDL_GetError ());
828 953
… …
901void 1026void
902error (char *message) 1027error (char *message)
903 CODE: 1028 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1030#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1032#endif
908 1033
909void 1034void
910fatal (char *message) 1035fatal (char *message)
911 CODE: 1036 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1038#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1040#endif
916 _exit (1); 1041 _exit (1);
917 1042
918void 1043void
919_exit (int retval = 0) 1044_exit (int retval = 0)
… …
931#if DEBUG 1056#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
933#endif 1058#endif
934} 1059}
935 1060
936MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
937 1062
938CFPlus::Font 1063PROTOTYPES: DISABLE
1064
1065DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1067 CODE:
941{ 1068{
942 int count; 1069 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
946} 1073}
947 OUTPUT: 1074 OUTPUT:
948 RETVAL 1075 RETVAL
949 1076
950void 1077void
951DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
952 CODE: 1079 CODE:
953 pango_font_description_free (self); 1080 pango_font_description_free (self);
954 1081
955void 1082void
956make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1084 PROTOTYPE: $
957 CODE: 1085 CODE:
958 default_font = self; 1086 default_font = self;
959 1087
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1089
1090PROTOTYPES: DISABLE
1091
962void 1092void
963reset_glyph_cache () 1093glyph_cache_backup ()
1094 PROTOTYPE:
964 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
965 tc_clear (); 1102 tc_restore ();
966 1103
967CFPlus::Layout 1104DC::Layout
968new (SV *class) 1105new (SV *class)
969 CODE: 1106 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
971 1108
972 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
… …
974 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
979 1117
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
982 OUTPUT: 1120 OUTPUT:
983 RETVAL 1121 RETVAL
984 1122
985void 1123void
986DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
987 CODE: 1125 CODE:
988 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
989 Safefree (self); 1128 Safefree (self);
990 1129
991void 1130void
992set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
993 CODE: 1132 CODE:
994{ 1133{
995 STRLEN textlen; 1134 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
997 1136
998 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
999} 1138}
1000 1139
1001void 1140void
1002set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1003 CODE: 1142 CODE:
1004{ 1143{
1005 STRLEN textlen; 1144 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1007 1146
1008 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1009} 1148}
1010 1149
1011void 1150void
1012set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1013 CODE: 1152 CODE:
1014{ 1153{
1015 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1156 const char *pos = text;
… …
1052 if (attrs) 1191 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1054} 1193}
1055 1194
1056void 1195void
1057get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1058 PPCODE: 1197 PPCODE:
1059{ 1198{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1200
1062 do 1201 do
1063 { 1202 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1204
1066 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1067 { 1206 {
1068 PangoRectangle extents; 1207 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1216
1078 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1079} 1218}
1080 1219
1081int 1220int
1082has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1083 CODE: 1222 CODE:
1084{ 1223{
1085 int lines = 1; 1224 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1087 1226
… …
1092} 1231}
1093 OUTPUT: 1232 OUTPUT:
1094 RETVAL 1233 RETVAL
1095 1234
1096SV * 1235SV *
1097get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1098 CODE: 1237 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1240 OUTPUT:
1102 RETVAL 1241 RETVAL
1103 1242
1104void 1243void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1244set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1245 CODE:
1107 self->r = r; 1246 self->r = r;
1108 self->g = g; 1247 self->g = g;
1109 self->b = b; 1248 self->b = b;
1110 self->a = a; 1249 self->a = a;
1111 1250
1112void 1251void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1253 CODE:
1115 if (self->font != font) 1254 if (self->font != font)
1116 { 1255 {
1117 self->font = font; 1256 self->font = font;
1118 layout_update_font (self); 1257 layout_update_font (self);
1119 } 1258 }
1120 1259
1121void 1260void
1122set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1123 CODE: 1262 CODE:
1124 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1125 { 1264 {
1126 self->base_height = base_height; 1265 self->base_height = base_height;
1127 layout_update_font (self); 1266 layout_update_font (self);
1128 } 1267 }
1129 1268
1130void 1269void
1131set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1271 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1272 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1273
1135void 1274void
1136set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1137 CODE: 1276 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1278
1140void 1279void
1141set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1142 CODE: 1281 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1283
1145void 1284void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1286 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1153 ); 1292 );
1154 1293
1155void 1294void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1296 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1298
1160void 1299void
1161size (CFPlus::Layout self) 1300size (DC::Layout self)
1162 PPCODE: 1301 PPCODE:
1163{ 1302{
1164 int w, h; 1303 int w, h;
1165 1304
1166 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1171} 1310}
1172 1311
1173int 1312int
1174descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1175 CODE: 1314 CODE:
1176{ 1315{
1177 PangoRectangle rect; 1316 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1181} 1320}
1182 OUTPUT: 1321 OUTPUT:
1183 RETVAL 1322 RETVAL
1184 1323
1185int 1324int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1326 CODE:
1188{ 1327{
1189 int index, trailing; 1328 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1329 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1192} 1331}
1193 OUTPUT: 1332 OUTPUT:
1194 RETVAL 1333 RETVAL
1195 1334
1196void 1335void
1197cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1337 PPCODE:
1199{ 1338{
1200 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1341
1203 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1346}
1208 1347
1209void 1348void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1350 PPCODE:
1212{ 1351{
1213 int line, x; 1352 int line, x;
1214 1353
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1357 --line;
1358#endif
1218 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1362}
1222 1363
1223void 1364void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1366 PPCODE:
1226{ 1367{
1227 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1228 int index, trailing; 1369 int index, trailing;
1229 1370
1230 if (line < 0) 1371 if (line < 0)
1231 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1232 1373
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1235 1376
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1378
1238 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1386 }
1246} 1387}
1247 1388
1248void 1389void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1252 self->pl, 1394 self->pl,
1395 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1255 flags 1398 flags
1256 ); 1399 );
1400 // we assume that context_change actually clears/frees stuff
1401 // and does not do any recomputation...
1402 pango_layout_context_changed (self->pl);
1257 1403
1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1259
1260int minpot (int n)
1261
1262void 1404void
1263pad2pot (SV *data_, SV *w_, SV *h_) 1405draw (DC::Layout self)
1264 CODE: 1406 CODE:
1265{ 1407{
1266 int ow = SvIV (w_); 1408 glEnable (GL_TEXTURE_2D);
1267 int oh = SvIV (h_); 1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1410 glEnable (GL_BLEND);
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1268 1415
1269 if (ow && oh) 1416 rc_draw (self->rc);
1417
1418 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D);
1421}
1422
1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1424
1425PROTOTYPES: ENABLE
1426
1427void
1428pad (SV *data_, int ow, int oh, int nw, int nh)
1429 CODE:
1430{
1431 if ((nw != ow || nh != oh) && SvOK (data_))
1270 { 1432 {
1271 int nw = minpot (ow);
1272 int nh = minpot (oh);
1273
1274 if (nw != ow || nh != oh)
1275 {
1276 if (SvOK (data_))
1277 {
1278 STRLEN datalen; 1433 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen); 1434 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh); 1435 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1436 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282 1437
1283 SvPOK_only (result_); 1438 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp); 1439 SvCUR_set (result_, nw * nh * bpp);
1285 1440
1286 memset (SvPVX (result_), 0, nw * nh * bpp); 1441 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--) 1442 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1443 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289 1444
1290 sv_setsv (data_, result_); 1445 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 } 1446 }
1297} 1447}
1298 1448
1299void 1449void
1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1450draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1306{ 1456{
1307 HV *hv = (HV *)SvRV (self); 1457 HV *hv = (HV *)SvRV (self);
1308 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1458 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1309 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1459 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1310 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1460 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1461
1462 if (name <= 0)
1463 XSRETURN_EMPTY;
1311 1464
1312 if (items < 5) 1465 if (items < 5)
1313 { 1466 {
1314 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1467 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1315 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1468 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1354 RETVAL = width > 0; 1507 RETVAL = width > 0;
1355} 1508}
1356 OUTPUT: 1509 OUTPUT:
1357 RETVAL 1510 RETVAL
1358 1511
1359MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1360 1513
1361CFPlus::Map 1514PROTOTYPES: DISABLE
1515
1516DC::Map
1362new (SV *class) 1517new (SV *class)
1363 CODE: 1518 CODE:
1364 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1365 RETVAL->x = 0; 1520 RETVAL->x = 0;
1366 RETVAL->y = 0; 1521 RETVAL->y = 0;
… …
1374 RETVAL->row = 0; 1529 RETVAL->row = 0;
1375 OUTPUT: 1530 OUTPUT:
1376 RETVAL 1531 RETVAL
1377 1532
1378void 1533void
1379DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1380 CODE: 1535 CODE:
1381{ 1536{
1382 map_clear (self); 1537 map_clear (self);
1383 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1384 Safefree (self->tex); 1539 Safefree (self->tex);
1385 Safefree (self); 1540 Safefree (self);
1386} 1541}
1387 1542
1388void 1543void
1389resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1390 CODE: 1545 CODE:
1391 self->w = map_width; 1546 self->w = map_width;
1392 self->h = map_height; 1547 self->h = map_height;
1393 1548
1394void 1549void
1395clear (CFPlus::Map self) 1550clear (DC::Map self)
1396 CODE: 1551 CODE:
1397 map_clear (self); 1552 map_clear (self);
1398 1553
1399void 1554void
1400set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1401 CODE: 1556 CODE:
1402{ 1557{
1403 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1404 need_texid (self, tile); 1559 need_texid (self, tile);
1405} 1560}
1406 1561
1407void 1562void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1409 CODE: 1564 CODE:
1410{ 1565{
1411 tileid texid; 1566 tileid texid;
1412 maptex *tex; 1567 maptex *tex;
1413 1568
… …
1426 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1428} 1583}
1429 1584
1430void 1585void
1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1586set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1432 CODE: 1587 CODE:
1433{ 1588{
1434 need_texid (self, texid); 1589 need_texid (self, texid);
1435 1590
1436 { 1591 {
… …
1456 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1458} 1613}
1459 1614
1460int 1615int
1461ox (CFPlus::Map self) 1616ox (DC::Map self)
1462 ALIAS: 1617 ALIAS:
1463 oy = 1 1618 oy = 1
1464 x = 2 1619 x = 2
1465 y = 3 1620 y = 3
1466 w = 4 1621 w = 4
… …
1477 } 1632 }
1478 OUTPUT: 1633 OUTPUT:
1479 RETVAL 1634 RETVAL
1480 1635
1481void 1636void
1482scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1483 CODE: 1638 CODE:
1484{ 1639{
1485 if (dx > 0) 1640 if (dx > 0)
1486 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1487 else if (dx < 0) 1642 else if (dx < 0)
… …
1502 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1503 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1504 } 1659 }
1505} 1660}
1506 1661
1507void 1662SV *
1508map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1509 CODE: 1664 CODE:
1510{ 1665{
1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1512 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1513 mapcell *cell; 1668 mapcell *cell;
1514 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1515 1672
1516 while (data < data_end - 1) 1673 while (data < data_end - 1)
1517 { 1674 {
1518 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1519 1676
… …
1539 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1540 1697
1541 do 1698 do
1542 { 1699 {
1543 ext = *data++; 1700 ext = *data++;
1544 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1545 1702
1546 if (cmd < 4) 1703 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1549 { 1706 {
… …
1552 } 1709 }
1553 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1556 { 1713 {
1557 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1558 ; // decode player count 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1559 1718
1560 data += *data + 1; 1719 data += *data + 1;
1561 } 1720 }
1562 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1563 cell->flags = *data++; 1722 cell->flags = *data++;
… …
1570 } 1729 }
1571 else 1730 else
1572 cell->darkness = *data++ + 1; 1731 cell->darkness = *data++ + 1;
1573 } 1732 }
1574 1733
1734 for (z = 0; z <= 2; ++z)
1575 if (flags & 4) 1735 if (flags & (4 >> z))
1576 { 1736 {
1577 faceid face = (data [0] << 8) + data [1]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face); 1738 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face]; 1739 cell->tile [z] = self->face2tile [face];
1740
1741 if (cell->tile [z])
1742 {
1743 maptex *tex = self->tex + cell->tile [z];
1744 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z]));
1746
1747 if (tex->smoothtile)
1748 {
1749 maptex *smooth = self->tex + tex->smoothtile;
1750 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile));
1752 }
1753 }
1580 } 1754 }
1581
1582 if (flags & 2)
1583 {
1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1587 }
1588
1589 if (flags & 1)
1590 {
1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1594 }
1595 } 1755 }
1596 else 1756 else
1597 cell->darkness = 0; 1757 cell->darkness = 0;
1598 } 1758 }
1599} 1759}
1760 OUTPUT:
1761 RETVAL
1600 1762
1601SV * 1763SV *
1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1603 CODE: 1765 CODE:
1604{ 1766{
1605 int x1, x; 1767 int x1, x;
1606 int y1, y; 1768 int y1, y;
1607 int z; 1769 int z;
… …
1652} 1814}
1653 OUTPUT: 1815 OUTPUT:
1654 RETVAL 1816 RETVAL
1655 1817
1656void 1818void
1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1658 CODE: 1820 CODE:
1659{ 1821{
1822 int x, y, z;
1823
1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1663 smooth_key skey; 1827 smooth_key skey;
1664 int x, y, z; 1828 int pl_x, pl_y;
1665 int last_name; 1829 maptex pl_tex;
1830 rc_t *rc = rc_alloc ();
1831 rc_key_t key;
1832 rc_array_t *arr;
1833
1834 pl_tex.name = 0;
1666 1835
1667 // thats current max. sorry. 1836 // thats current max. sorry.
1668 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1670 1839
1671 // clear key, in case of extra padding 1840 // clear key, in case of extra padding
1672 memset (&skey, 0, sizeof (skey)); 1841 memset (&skey, 0, sizeof (skey));
1673 1842
1674 glColor4ub (255, 255, 255, 255); 1843 memset (&key, 0, sizeof (key));
1675 1844 key.r = 255;
1676 glEnable (GL_BLEND); 1845 key.g = 255;
1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1846 key.b = 255;
1678 glEnable (GL_TEXTURE_2D); 1847 key.a = 255;
1679 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1848 key.mode = GL_QUADS;
1680 1849 key.format = GL_T2F_V3F;
1681 glBegin (GL_QUADS); 1850 key.texname = -1;
1682
1683 last_name = 0;
1684 1851
1685 mx += self->x; 1852 mx += self->x;
1686 my += self->y; 1853 my += self->y;
1687 1854
1688 // first pass: determine smooth_max 1855 // first pass: determine smooth_max
… …
1704 MAX (self->tex [cell->tile [0]].smoothlevel, 1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel, 1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel)); 1873 self->tex [cell->tile [2]].smoothlevel));
1707 } 1874 }
1708 } 1875 }
1876
1877 glEnable (GL_BLEND);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1709 1880
1710 for (z = 0; z <= 2; z++) 1881 for (z = 0; z <= 2; z++)
1711 { 1882 {
1712 memset (smooth_level, 0, sizeof (smooth_level)); 1883 memset (smooth_level, 0, sizeof (smooth_level));
1713 1884
… …
1726 { 1897 {
1727 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w; 1899 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h; 1900 int py = (y + 1) * T - tex.h;
1730 1901
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name) 1902 if (key.texname != tex.name)
1734 { 1903 {
1735 if (!tex.name) 1904 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1737 1906
1738 glEnd (); 1907 key.texname = tex.name;
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 arr = rc_array (rc, &key);
1740 glBegin (GL_QUADS);
1741 } 1909 }
1742 1910
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 { 1912 {
1913 pl_x = px;
1914 pl_y = py;
1915 pl_tex = tex;
1916 continue;
1917 }
1918
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1750 if (cell->flags & 1) 1927 if (cell->flags & 1)
1751 { 1928 {
1752 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32; 1930 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32; 1931 int py = y * T - T * 6 / 32;
1755 1932
1933 if (tex.name)
1756 glEnd (); 1934 {
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1758 glBegin (GL_QUADS); 1945 }
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 } 1946 }
1765 } 1947 }
1766 1948
1767 // update smooth hash 1949 // update smooth hash
1768 if (tex.smoothtile) 1950 if (tex.smoothtile)
… …
1804 } 1986 }
1805 } 1987 }
1806 } 1988 }
1807 } 1989 }
1808 1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1809 // go through all smoothlevels, lowest to highest, then draw. 1994 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort 1995 // this is basically counting sort
1811 { 1996 {
1812 int w, b; 1997 int w, b;
1813 1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
1814 for (w = 0; w < 256 / 32; ++w) 2001 for (w = 0; w < 256 / 32; ++w)
1815 { 2002 {
1816 uint32_t smask = smooth_level [w]; 2003 uint32_t smask = smooth_level [w];
1817 if (smask) 2004 if (smask)
1818 for (b = 0; b < 32; ++b) 2005 for (b = 0; b < 32; ++b)
… …
1837 int border = bits & 15; 2024 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row 2026 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column 2027 float dy = tex.t * .5f ; // 2 images/column
1841 2028
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name) 2029 if (tex.name)
1845 { 2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
1846 if (!tex.name) 2033 if (key.texname != tex.name)
1847 continue; // smoothing not yet available 2034 {
1848
1849 glEnd (); 2035 glEnd ();
1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1851 glBegin (GL_QUADS); 2037 glBegin (GL_QUADS);
1852 } 2038 }
1853 2039
1854 if (border) 2040 if (border)
1855 { 2041 {
1856 float ox = border * dx; 2042 float ox = border * dx;
1857 2043
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1862 } 2048 }
1863 2049
1864 if (corner) 2050 if (corner)
1865 { 2051 {
1866 float ox = corner * dx; 2052 float ox = corner * dx;
1867 2053
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
1872 } 2059 }
1873 } 2060 }
1874 } 2061 }
1875 } 2062 }
1876 } 2063 }
2064
2065 glEnd ();
2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
1877 } 2068 }
1878 2069
1879 hv_clear (smooth); 2070 hv_clear (smooth);
1880 } 2071 }
1881 2072
1882 glEnd (); 2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
1883 2078
1884 glDisable (GL_TEXTURE_2D); 2079 key.texname = tex.name;
2080 arr = rc_array (rc, &key);
2081
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086
2087 rc_draw (rc);
2088 }
2089
1885 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2091 rc_free (rc);
1886 2092
1887 // top layer: overlays such as the health bar 2093 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++) 2094 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows) 2095 if (0 <= y + my && y + my < self->rows)
1890 { 2096 {
… …
1915 } 2121 }
1916 } 2122 }
1917} 2123}
1918 2124
1919void 2125void
1920draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1921 CODE: 2127 CODE:
1922{ 2128{
1923 static float color[16][3] = { 2129 static float color[16][3] = {
1924 { 0.00F, 0.00F, 0.00F }, 2130 { 0.00F, 0.00F, 0.00F },
1925 { 1.00F, 1.00F, 1.00F }, 2131 { 1.00F, 1.00F, 1.00F },
… …
1975 glDisable (GL_BLEND); 2181 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D); 2182 glDisable (GL_TEXTURE_2D);
1977} 2183}
1978 2184
1979void 2185void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2186fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1981 PPCODE: 2187 PPCODE:
1982{ 2188{
1983 int x, y; 2189 int x, y;
2190 int sw1 = sw + 2;
2191 int sh1 = sh + 2;
2192 int sh3 = sh * 3;
1984 int sw4 = (sw + 3) & ~3; 2193 int sw34 = (sw * 3 + 3) & ~3;
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1987 2197
1988 memset (darkness, 255, sw4 * sh);
1989 SvPOK_only (darkness_sv); 2198 SvPOK_only (darkness3_sv);
1990 SvCUR_set (darkness_sv, sw4 * sh); 2199 SvCUR_set (darkness3_sv, sw34 * sh3);
1991 2200
1992 mx += self->x; 2201 mx += self->x - 1;
1993 my += self->y; 2202 my += self->y - 1;
1994 2203
2204 memset (darkness1, 255, sw1 * sh1);
2205
1995 for (y = 0; y < sh; y++) 2206 for (y = 0; y < sh1; y++)
1996 if (0 <= y + my && y + my < self->rows) 2207 if (0 <= y + my && y + my < self->rows)
1997 { 2208 {
1998 maprow *row = self->row + (y + my); 2209 maprow *row = self->row + (y + my);
1999 2210
2000 for (x = 0; x < sw; x++) 2211 for (x = 0; x < sw1; x++)
2001 if (row->c0 <= x + mx && x + mx < row->c1) 2212 if (row->c0 <= x + mx && x + mx < row->c1)
2002 { 2213 {
2003 mapcell *cell = row->col + (x + mx - row->c0); 2214 mapcell *cell = row->col + (x + mx - row->c0);
2004 2215
2005 darkness[y * sw4 + x] = cell->darkness 2216 darkness1 [y * sw1 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1) 2217 ? 255 - (cell->darkness - 1)
2007 : 255 - FOW_DARKNESS; 2218 : 255 - FOW_DARKNESS;
2008 } 2219 }
2009 } 2220 }
2010 2221
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y) 2222 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x) 2223 for (x = 0; x < sw; ++x)
2021 { 2224 {
2022 float *f = (float *)matrix; 2225 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2023 int dx, dy; 2226 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2024 float sum = 0.f; 2227 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2228 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2229 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2230 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2231 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2232 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2233 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2025 2234
2026 for (dy = -1; dy <= 1; ++dy) 2235 uint8_t r11 = (d11 + d21 + d12) / 3;
2027 for (dx = -1; dx <= 1; ++dx) 2236 uint8_t r21 = d21;
2028 { 2237 uint8_t r31 = (d21 + d31 + d32) / 3;
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031 2238
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2239 uint8_t r12 = d12;
2033 } 2240 uint8_t r22 = d22;
2241 uint8_t r32 = d32;
2034 2242
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2243 uint8_t r13 = (d13 + d23 + d12) / 3;
2036 } 2244 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3;
2037 2246
2038 darkness_sv = darkness2_sv; 2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2039 } 2256 }
2257
2258 free (darkness1);
2040 2259
2041 EXTEND (SP, 3); 2260 EXTEND (SP, 3);
2042 PUSHs (sv_2mortal (newSViv (sw4))); 2261 PUSHs (sv_2mortal (newSViv (sw34)));
2043 PUSHs (sv_2mortal (newSViv (sh))); 2262 PUSHs (sv_2mortal (newSViv (sh3)));
2044 PUSHs (darkness_sv); 2263 PUSHs (darkness3_sv);
2045} 2264}
2046 2265
2047SV * 2266SV *
2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2267get_rect (DC::Map self, int x0, int y0, int w, int h)
2049 CODE: 2268 CODE:
2050{ 2269{
2051 int x, y, x1, y1; 2270 int x, y, x1, y1;
2052 SV *data_sv = newSV (w * h * 7 + 5); 2271 SV *data_sv = newSV (w * h * 7 + 5);
2053 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2272 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2110 else 2329 else
2111 *data++ = 0; 2330 *data++ = 0;
2112 } 2331 }
2113 } 2332 }
2114 2333
2334 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 {
2115 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
2116 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
2117 RETVAL = data_sv; 2341 RETVAL = data_sv;
2118} 2342}
2119 OUTPUT: 2343 OUTPUT:
2120 RETVAL 2344 RETVAL
2121 2345
2122void 2346void
2123set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2124 PPCODE: 2348 PPCODE:
2125{ 2349{
2126 int x, y, z; 2350 int x, y, z;
2127 int w, h; 2351 int w, h;
2128 int x1, y1; 2352 int x1, y1;
2353 STRLEN len;
2354 uint8_t *data, *end;
2355
2356 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv);
2359 end = data + len + 8;
2360
2361 if (len < 5)
2362 XSRETURN_EMPTY;
2129 2363
2130 if (*data++ != 0) 2364 if (*data++ != 0)
2131 return; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
2132 2366
2133 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
2134 h = *data++ << 8; h |= *data++; 2368 h = *data++ << 8; h |= *data++;
2135 2369
2136 // we need to do this 'cause we don't keep an absolute coord system for rows 2370 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2148 { 2382 {
2149 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
2150 2384
2151 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
2152 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
2153 uint8_t flags = *data++; 2392 flags = *data++;
2154 2393
2155 if (flags) 2394 if (flags)
2156 { 2395 {
2157 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 }; 2397 tileid tile[3] = { 0, 0, 0 };
… …
2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2163 2402
2164 if (cell->darkness == 0) 2403 if (cell->darkness == 0)
2165 { 2404 {
2166 cell->darkness = 0; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
2167 2407
2168 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
2169 { 2409 {
2170 tileid t = tile [z]; 2410 tileid t = tile [z];
2171 2411
2172 if (t >= self->texs || (t && !self->tex [t].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2173 { 2413 {
2174 XPUSHs (sv_2mortal (newSViv (t))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t); 2415 need_texid (self, t);
2176 } 2416 }
2177 2417
2178 cell->tile [z] = t; 2418 cell->tile [z] = t;
2179 } 2419 }
… …
2181 } 2421 }
2182 } 2422 }
2183 } 2423 }
2184} 2424}
2185 2425
2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2426MODULE = Deliantra::Client PACKAGE = DC::RW
2187 2427
2188CFPlus::MixChunk 2428DC::RW
2189new_from_file (SV *class, char *path) 2429new (SV *class, SV *data_sv)
2190 CODE: 2430 CODE:
2191 RETVAL = Mix_LoadWAV (path); 2431{
2432 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen);
2434
2435 RETVAL = SDL_RWFromConstMem (data, datalen);
2436}
2192 OUTPUT: 2437 OUTPUT:
2193 RETVAL 2438 RETVAL
2194 2439
2440DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb")
2442 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT:
2445 RETVAL
2446
2447# fails on win32:
2448# dc.xs(2268) : error C2059: syntax error : '('
2195void 2449#void
2450#close (DC::RW self)
2451# CODE:
2452# (self->(close)) (self);
2453
2454MODULE = Deliantra::Client PACKAGE = DC::Channel
2455
2456PROTOTYPES: DISABLE
2457
2458DC::Channel
2459find ()
2460 CODE:
2461{
2462 RETVAL = Mix_GroupAvailable (-1);
2463
2464 if (RETVAL < 0)
2465 {
2466 RETVAL = Mix_GroupOldest (-1);
2467
2468 if (RETVAL < 0)
2469 XSRETURN_UNDEF;
2470
2471 Mix_HaltChannel (RETVAL);
2472 }
2473
2474 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128);
2476}
2477 OUTPUT:
2478 RETVAL
2479
2480void
2481halt (DC::Channel self)
2482 CODE:
2483 Mix_HaltChannel (self);
2484
2485void
2486expire (DC::Channel self, int ticks = -1)
2487 CODE:
2488 Mix_ExpireChannel (self, ticks);
2489
2490void
2491fade_out (DC::Channel self, int ticks = -1)
2492 CODE:
2493 Mix_FadeOutChannel (self, ticks);
2494
2495int
2496volume (DC::Channel self, int volume)
2497 CODE:
2498 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2499 OUTPUT:
2500 RETVAL
2501
2502void
2503unregister_all_effects (DC::Channel self)
2504 CODE:
2505 Mix_UnregisterAllEffects (self);
2506
2507void
2508set_panning (DC::Channel self, int left, int right)
2509 CODE:
2510 left = CLAMP (left , 0, 255);
2511 right = CLAMP (right, 0, 255);
2512 Mix_SetPanning (self, left, right);
2513
2514void
2515set_distance (DC::Channel self, int distance)
2516 CODE:
2517 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2518
2519void
2520set_position (DC::Channel self, int angle, int distance)
2521 CODE:
2522
2523void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE:
2526{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530}
2531
2532void
2533set_reverse_stereo (DC::Channel self, int flip)
2534 CODE:
2535 Mix_SetReverseStereo (self, flip);
2536
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538
2539PROTOTYPES: DISABLE
2540
2541DC::MixChunk
2542new (SV *class, DC::RW rwops)
2543 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT:
2546 RETVAL
2547
2548void
2196DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
2197 CODE: 2550 CODE:
2198 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
2199 2552
2200int 2553int
2201volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
2202 CODE: 2555 CODE:
2556 if (items > 1)
2557 volume = CLAMP (volume, 0, 128);
2203 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
2204 OUTPUT: 2559 OUTPUT:
2205 RETVAL 2560 RETVAL
2206 2561
2207int 2562DC::Channel
2208play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2563play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2209 CODE: 2564 CODE:
2565{
2210 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2567
2568 if (RETVAL < 0)
2569 XSRETURN_UNDEF;
2570
2571 if (channel < 0)
2572 {
2573 Mix_UnregisterAllEffects (RETVAL);
2574 Mix_Volume (RETVAL, 128);
2575 }
2576}
2211 OUTPUT: 2577 OUTPUT:
2212 RETVAL 2578 RETVAL
2213 2579
2214MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2215 2581
2216int 2582int
2217volume (int volume = -1) 2583volume (int volume = -1)
2584 PROTOTYPE: ;$
2218 CODE: 2585 CODE:
2586 if (items > 0)
2587 volume = CLAMP (volume, 0, 128);
2219 RETVAL = Mix_VolumeMusic (volume); 2588 RETVAL = Mix_VolumeMusic (volume);
2220 OUTPUT: 2589 OUTPUT:
2221 RETVAL 2590 RETVAL
2222 2591
2592void
2593fade_out (int ms)
2594 CODE:
2595 Mix_FadeOutMusic (ms);
2596
2597void
2598halt ()
2599 CODE:
2600 Mix_HaltMusic ();
2601
2602DC::MixMusic
2603new (SV *class, DC::RW rwops)
2604 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT:
2607 RETVAL
2608
2609void
2610DESTROY (DC::MixMusic self)
2611 CODE:
2612 Mix_FreeMusic (self);
2613
2223int 2614int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
2230CFPlus::MixMusic
2231new_from_file (SV *class, char *path)
2232 CODE:
2233 RETVAL = Mix_LoadMUS (path);
2234 OUTPUT:
2235 RETVAL
2236
2237void
2238DESTROY (CFPlus::MixMusic self)
2239 CODE:
2240 Mix_FreeMusic (self);
2241
2242int
2243play (CFPlus::MixMusic self, int loops = -1) 2615play (DC::MixMusic self, int loops = -1)
2244 CODE: 2616 CODE:
2245 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
2246 OUTPUT: 2618 OUTPUT:
2247 RETVAL 2619 RETVAL
2248 2620
2249int 2621void
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2251 CODE: 2623 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2624 Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT:
2254 RETVAL
2255 2625
2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2627
2628PROTOTYPES: ENABLE
2257 2629
2258BOOT: 2630BOOT:
2259{ 2631{
2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2261 static const struct { 2633 static const struct {
2262 const char *name; 2634 const char *name;
2263 IV iv; 2635 IV iv;
2264 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
2265# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
… …
2277 const_iv (GL_ALPHA_TEST), 2649 const_iv (GL_ALPHA_TEST),
2278 const_iv (GL_NORMALIZE), 2650 const_iv (GL_NORMALIZE),
2279 const_iv (GL_RESCALE_NORMAL), 2651 const_iv (GL_RESCALE_NORMAL),
2280 const_iv (GL_FRONT), 2652 const_iv (GL_FRONT),
2281 const_iv (GL_BACK), 2653 const_iv (GL_BACK),
2654 const_iv (GL_AUX0),
2282 const_iv (GL_AND), 2655 const_iv (GL_AND),
2283 const_iv (GL_ONE), 2656 const_iv (GL_ONE),
2284 const_iv (GL_ZERO), 2657 const_iv (GL_ZERO),
2285 const_iv (GL_SRC_ALPHA), 2658 const_iv (GL_SRC_ALPHA),
2286 const_iv (GL_DST_ALPHA), 2659 const_iv (GL_DST_ALPHA),
… …
2299 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
2300 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
2301 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
2302 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2676 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2677 const_iv (GL_COMPRESSED_ALPHA_ARB),
2678 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2680 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2681 const_iv (GL_COMPRESSED_RGB_ARB),
2682 const_iv (GL_COMPRESSED_RGBA_ARB),
2304 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D), 2684 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D), 2685 const_iv (GL_PROXY_TEXTURE_2D),
2307 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
2308 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
… …
2332 const_iv (GL_COLOR_LOGIC_OP), 2711 const_iv (GL_COLOR_LOGIC_OP),
2333 const_iv (GL_SEPARABLE_2D), 2712 const_iv (GL_SEPARABLE_2D),
2334 const_iv (GL_CONVOLUTION_2D), 2713 const_iv (GL_CONVOLUTION_2D),
2335 const_iv (GL_CONVOLUTION_BORDER_MODE), 2714 const_iv (GL_CONVOLUTION_BORDER_MODE),
2336 const_iv (GL_CONSTANT_BORDER), 2715 const_iv (GL_CONSTANT_BORDER),
2716 const_iv (GL_POINTS),
2337 const_iv (GL_LINES), 2717 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP), 2718 const_iv (GL_LINE_STRIP),
2339 const_iv (GL_LINE_LOOP), 2719 const_iv (GL_LINE_LOOP),
2340 const_iv (GL_QUADS), 2720 const_iv (GL_QUADS),
2341 const_iv (GL_QUAD_STRIP), 2721 const_iv (GL_QUAD_STRIP),
2342 const_iv (GL_TRIANGLES), 2722 const_iv (GL_TRIANGLES),
2343 const_iv (GL_TRIANGLE_STRIP), 2723 const_iv (GL_TRIANGLE_STRIP),
2344 const_iv (GL_TRIANGLE_FAN), 2724 const_iv (GL_TRIANGLE_FAN),
2725 const_iv (GL_POLYGON),
2345 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2727 const_iv (GL_POINT_SMOOTH_HINT),
2728 const_iv (GL_LINE_SMOOTH_HINT),
2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2346 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2733 const_iv (GL_DONT_CARE),
2734 const_iv (GL_NICEST),
2347 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
2348 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
2349 const_iv (GL_T2F_V3F), 2737 const_iv (GL_T2F_V3F),
2350 const_iv (GL_T2F_N3F_V3F), 2738 const_iv (GL_T2F_N3F_V3F),
2351# undef const_iv 2739# undef const_iv
… …
2356 2744
2357 texture_av = newAV (); 2745 texture_av = newAV ();
2358 AvREAL_off (texture_av); 2746 AvREAL_off (texture_av);
2359} 2747}
2360 2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
2754
2361char * 2755char *
2362gl_vendor () 2756gl_vendor ()
2363 CODE: 2757 CODE:
2364 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
2365 OUTPUT: 2759 OUTPUT:
… …
2437# near_ and far_ are due to microsofts buggy "c" compiler 2831# near_ and far_ are due to microsofts buggy "c" compiler
2438void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2832void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2439 2833
2440# near_ and far_ are due to microsofts buggy "c" compiler 2834# near_ and far_ are due to microsofts buggy "c" compiler
2441void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2835void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2836
2837PROTOTYPES: DISABLE
2442 2838
2443void glViewport (int x, int y, int width, int height) 2839void glViewport (int x, int y, int width, int height)
2444 2840
2445void glScissor (int x, int y, int width, int height) 2841void glScissor (int x, int y, int width, int height)
2446 2842
… …
2454 2850
2455void glRotate (float angle, float x, float y, float z) 2851void glRotate (float angle, float x, float y, float z)
2456 CODE: 2852 CODE:
2457 glRotatef (angle, x, y, z); 2853 glRotatef (angle, x, y, z);
2458 2854
2459void glBegin (int mode)
2460
2461void glEnd ()
2462
2463void glColor (float r, float g, float b, float a = 1.0) 2855void glColor (float r, float g, float b, float a = 1.0)
2464 PROTOTYPE: @
2465 ALIAS: 2856 ALIAS:
2466 glColor_premultiply = 1 2857 glColor_premultiply = 1
2467 CODE: 2858 CODE:
2468 if (ix) 2859 if (ix)
2469 { 2860 {
… …
2472 b *= a; 2863 b *= a;
2473 } 2864 }
2474 // microsoft visual "c" rounds instead of truncating... 2865 // microsoft visual "c" rounds instead of truncating...
2475 glColor4f (r, g, b, a); 2866 glColor4f (r, g, b, a);
2476 2867
2477void glInterleavedArrays (int format, int stride, char *data)
2478
2479void glDrawElements (int mode, int count, int type, char *indices)
2480
2481# 1.2 void glDrawRangeElements (int mode, int start, int end
2482
2483void glRasterPos (float x, float y, float z = 0.) 2868void glRasterPos (float x, float y, float z = 0.)
2484 CODE: 2869 CODE:
2485 glRasterPos3f (0, 0, z); 2870 glRasterPos3f (0, 0, z);
2486 glBitmap (0, 0, 0, 0, x, y, 0); 2871 glBitmap (0, 0, 0, 0, x, y, 0);
2487 2872
… …
2491 2876
2492void glTexCoord (float s, float t) 2877void glTexCoord (float s, float t)
2493 CODE: 2878 CODE:
2494 glTexCoord2f (s, t); 2879 glTexCoord2f (s, t);
2495 2880
2881void glRect (float x1, float y1, float x2, float y2)
2882 CODE:
2883 glRectf (x1, y1, x2, y2);
2884
2885void glRect_lineloop (float x1, float y1, float x2, float y2)
2886 CODE:
2887 glBegin (GL_LINE_LOOP);
2888 glVertex2f (x1, y1);
2889 glVertex2f (x2, y1);
2890 glVertex2f (x2, y2);
2891 glVertex2f (x1, y2);
2892 glEnd ();
2893
2894PROTOTYPES: ENABLE
2895
2896void glBegin (int mode)
2897
2898void glEnd ()
2899
2900void glPointSize (GLfloat size)
2901
2902void glLineWidth (GLfloat width)
2903
2904void glInterleavedArrays (int format, int stride, char *data)
2905
2906void glDrawElements (int mode, int count, int type, char *indices)
2907
2908# 1.2 void glDrawRangeElements (int mode, int start, int end
2909
2496void glTexEnv (int target, int pname, float param) 2910void glTexEnv (int target, int pname, float param)
2497 CODE: 2911 CODE:
2498 glTexEnvf (target, pname, param); 2912 glTexEnvf (target, pname, param);
2499 2913
2500void glTexParameter (int target, int pname, float param) 2914void glTexParameter (int target, int pname, float param)
… …
2516void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2930void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2517 CODE: 2931 CODE:
2518 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
2519 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2520 2934
2521void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2935void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2522 2936
2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2937void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2524 2938
2525void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2526 2940
… …
2552 2966
2553void glEndList () 2967void glEndList ()
2554 2968
2555void glCallList (int list) 2969void glCallList (int list)
2556 2970
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972
2973PROTOTYPES: DISABLE
2974
2975void
2976find_widget (SV *self, NV x, NV y)
2977 PPCODE:
2978{
2979 if (within_widget (self, x, y))
2980 XPUSHs (self);
2981}
2982
2983BOOT:
2984{
2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2986
2987 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2988 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2989 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2990 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2991}
2992
2993void
2994draw (SV *self)
2995 CODE:
2996{
2997 HV *hv;
2998 SV **svp;
2999 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv);
3004 double draw_x, draw_y;
3005
3006 if (!SvROK (self))
3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3008
3009 hv = (HV *)SvRV (self);
3010
3011 if (SvTYPE (hv) != SVt_PVHV)
3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3013
3014 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3015 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3016
3017 if (!h || !w)
3018 XSRETURN_EMPTY;
3019
3020 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3021 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3022
3023 draw_x = SvNV (draw_x_sv) + x;
3024 draw_y = SvNV (draw_y_sv) + y;
3025
3026 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3027 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3028 XSRETURN_EMPTY;
3029
3030 sv_setnv (draw_x_sv, draw_x);
3031 sv_setnv (draw_y_sv, draw_y);
3032
3033 glPushMatrix ();
3034 glTranslated (x, y, 0);
3035
3036 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3037 {
3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3039
3040 if (svp && SvTRUE (*svp))
3041 {
3042 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3043 glEnable (GL_BLEND);
3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3045 glBegin (GL_QUADS);
3046 glVertex2f (0, 0);
3047 glVertex2f (w, 0);
3048 glVertex2f (w, h);
3049 glVertex2f (0, h);
3050 glEnd ();
3051 glDisable (GL_BLEND);
3052 }
3053 }
3054#if 0
3055 // draw borders, for debugging
3056 glPushMatrix ();
3057 glColor4f (1., 1., 0., 1.);
3058 glTranslatef (.5, .5, 0.);
3059 glBegin (GL_LINE_LOOP);
3060 glVertex2f (0 , 0);
3061 glVertex2f (w - 1, 0);
3062 glVertex2f (w - 1, h - 1);
3063 glVertex2f (0 , h - 1);
3064 glEnd ();
3065 glPopMatrix ();
3066#endif
3067 PUSHMARK (SP);
3068 XPUSHs (self);
3069 PUTBACK;
3070 call_method ("_draw", G_VOID | G_DISCARD);
3071 SPAGAIN;
3072
3073 glPopMatrix ();
3074
3075 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3076 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3077}
3078

Diff Legend

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