--- deliantra/Deliantra-Client/Client.xs 2007/08/06 02:11:45 1.218 +++ deliantra/Deliantra-Client/Client.xs 2008/12/24 04:09:26 1.289 @@ -19,6 +19,11 @@ #ifdef _WIN32 # undef pipe +// microsoft vs. C +# define sqrtf(x) sqrt(x) +# define roundf(x) (int)(x) +# define atan2f(x,y) atan2(x,y) +# define M_PI 3.14159265f #endif #include @@ -36,6 +41,11 @@ #include #include +/* work around os x broken headers */ +#ifdef __MACOSX__ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +#endif + #define PANGO_ENABLE_BACKEND #define G_DISABLE_CAST_CHECKS @@ -43,6 +53,17 @@ #include +#ifndef PANGO_VERSION_CHECK +# define PANGO_VERSION_CHECK(a,b,c) 0 +#endif + +#if !PANGO_VERSION_CHECK (1, 15, 2) +# define pango_layout_get_line_readonly pango_layout_get_line +# define pango_layout_get_lines_readonly pango_layout_get_lines +# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line +# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run +#endif + #ifndef _WIN32 # include # include @@ -51,20 +72,32 @@ # include #endif +#if __GNUC__ >= 4 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + #define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ -#define FOW_DARKNESS 32 +#define FOW_DARKNESS 64 #define MAP_EXTEND_X 32 #define MAP_EXTEND_Y 512 #define MIN_FONT_HEIGHT 10 -#if 0 -# define PARACHUTE SDL_INIT_NOPARACHUTE -#else -# define PARACHUTE 0 -#endif +/* mask out modifiers we are not interested in */ +#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) + +#define KMOD_LRAM 0x10000 // our extension + +#define TEXID_SPEECH 1 +#define TEXID_NOFACE 2 +#define TEXID_HIDDEN 3 static AV *texture_av; @@ -111,17 +144,18 @@ } #include "texcache.c" +#include "rendercache.c" #include "pango-font.c" #include "pango-fontmap.c" #include "pango-render.c" -typedef IV CFPlus__Channel; -typedef SDL_RWops *CFPlus__RW; -typedef Mix_Chunk *CFPlus__MixChunk; -typedef Mix_Music *CFPlus__MixMusic; +typedef IV DC__Channel; +typedef SDL_RWops *DC__RW; +typedef Mix_Chunk *DC__MixChunk; +typedef Mix_Music *DC__MixMusic; -typedef PangoFontDescription *CFPlus__Font; +typedef PangoFontDescription *DC__Font; static int shape_attr_p (PangoLayoutRun *run) @@ -145,10 +179,11 @@ PangoLayout *pl; float r, g, b, a; // default color for rgba mode int base_height; - CFPlus__Font font; -} *CFPlus__Layout; + DC__Font font; + rc_t *rc; +} *DC__Layout; -static CFPlus__Font default_font; +static DC__Font default_font; static PangoContext *opengl_context; static PangoFontMap *opengl_fontmap; @@ -163,10 +198,10 @@ } static void -layout_update_font (CFPlus__Layout self) +layout_update_font (DC__Layout self) { /* use a random scale factor to account for unknown descenders, 0.8 works - * reasonably well with bitstream vera + * reasonably well with dejavu/bistream fonts */ PangoFontDescription *font = self->font ? self->font : default_font; @@ -177,7 +212,7 @@ } static void -layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) +layout_get_pixel_size (DC__Layout self, int *w, int *h) { PangoRectangle rect; @@ -198,12 +233,13 @@ typedef uint16_t faceid; typedef struct { - int name; + GLuint name; int w, h; float s, t; uint8_t r, g, b, a; tileid smoothtile; uint8_t smoothlevel; + uint8_t unused; /* set to zero on use */ } maptex; typedef struct { @@ -226,7 +262,7 @@ int32_t rows; maprow *row; -} *CFPlus__Map; +} *DC__Map; static char * prepend (char *ptr, int sze, int inc) @@ -274,7 +310,7 @@ } static maprow * -map_get_row (CFPlus__Map self, int y) +map_get_row (DC__Map self, int y) { if (0 > y) { @@ -322,13 +358,13 @@ } static mapcell * -map_get_cell (CFPlus__Map self, int x, int y) +map_get_cell (DC__Map self, int x, int y) { return row_get_cell (map_get_row (self, y), x); } static void -map_clear (CFPlus__Map self) +map_clear (DC__Map self) { int r; @@ -345,8 +381,18 @@ self->rows = 0; } +#define CELL_CLEAR(cell) \ + do { \ + if ((cell)->player) \ + (cell)->tile [2] = 0; \ + (cell)->darkness = 0; \ + (cell)->stat_hp = 0; \ + (cell)->flags = 0; \ + (cell)->player = 0; \ + } while (0) + static void -map_blank (CFPlus__Map self, int x0, int y0, int w, int h) +map_blank (DC__Map self, int x0, int y0, int w, int h) { int x, y; maprow *row; @@ -368,10 +414,7 @@ cell = row->col + x - row->c0; - cell->darkness = 0; - cell->stat_hp = 0; - cell->flags = 0; - cell->player = 0; + CELL_CLEAR (cell); } } } @@ -435,6 +478,17 @@ return n + 1; } +static unsigned int +popcount (unsigned int n) +{ + n -= (n >> 1) & 0x55555555U; + n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U); + n = ((n >> 4) + n) & 0x0f0f0f0fU; + n *= 0x01010101U; + + return n >> 24; +} + /* SDL should provide this, really. */ #define SDLK_MODIFIER_MIN 300 #define SDLK_MODIFIER_MAX 314 @@ -482,13 +536,65 @@ return 1; } -MODULE = CFPlus PACKAGE = CFPlus +/******************************************************************************/ + +/* process keyboard modifiers */ +static int +mod_munge (int mod) +{ + mod &= MOD_MASK; + + if (mod & (KMOD_META | KMOD_ALT)) + mod |= KMOD_LRAM; + + return mod; +} + +static void +deliantra_main () +{ + char *argv[] = { 0 }; + call_argv ("::main", G_DISCARD | G_VOID, argv); +} + +#ifdef __MACOSX__ + /* to due surprising braindamage on the side of SDL design, we + * do some mind-boggling hack here: SDL requires a custom main() + * on OS X, so... we provide one and call the original main(), which, + * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, + * and which calls our main (== SDL_main) back. + */ + extern C_LINKAGE int + main (int argc, char *argv[]) + { + deliantra_main (); + } + + #undef main + + extern C_LINKAGE int main (int argc, char *argv[]); + + static void + SDL_braino (void) + { + char *argv[] = { "deliantra client", 0 }; + (main) (1, argv); + } +#else + static void + SDL_braino (void) + { + deliantra_main (); + } +#endif + +MODULE = Deliantra::Client PACKAGE = DC PROTOTYPES: ENABLE BOOT: { - HV *stash = gv_stashpv ("CFPlus", 1); + HV *stash = gv_stashpv ("DC", 1); static const struct { const char *name; IV iv; @@ -520,6 +626,58 @@ const_iv (SDL_APPMOUSEFOCUS), const_iv (SDL_APPACTIVE), + + const_iv (SDLK_UNKNOWN), + const_iv (SDLK_FIRST), + const_iv (SDLK_BACKSPACE), + const_iv (SDLK_TAB), + const_iv (SDLK_CLEAR), + const_iv (SDLK_RETURN), + const_iv (SDLK_PAUSE), + const_iv (SDLK_ESCAPE), + const_iv (SDLK_SPACE), + const_iv (SDLK_EXCLAIM), + const_iv (SDLK_QUOTEDBL), + const_iv (SDLK_HASH), + const_iv (SDLK_DOLLAR), + const_iv (SDLK_AMPERSAND), + const_iv (SDLK_QUOTE), + const_iv (SDLK_LEFTPAREN), + const_iv (SDLK_RIGHTPAREN), + const_iv (SDLK_ASTERISK), + const_iv (SDLK_PLUS), + const_iv (SDLK_COMMA), + const_iv (SDLK_MINUS), + const_iv (SDLK_PERIOD), + const_iv (SDLK_SLASH), + const_iv (SDLK_0), + const_iv (SDLK_1), + const_iv (SDLK_2), + const_iv (SDLK_3), + const_iv (SDLK_4), + const_iv (SDLK_5), + const_iv (SDLK_6), + const_iv (SDLK_7), + const_iv (SDLK_8), + const_iv (SDLK_9), + const_iv (SDLK_COLON), + const_iv (SDLK_SEMICOLON), + const_iv (SDLK_LESS), + const_iv (SDLK_EQUALS), + const_iv (SDLK_GREATER), + const_iv (SDLK_QUESTION), + const_iv (SDLK_AT), + + const_iv (SDLK_LEFTBRACKET), + const_iv (SDLK_BACKSLASH), + const_iv (SDLK_RIGHTBRACKET), + const_iv (SDLK_CARET), + const_iv (SDLK_UNDERSCORE), + const_iv (SDLK_BACKQUOTE), + const_iv (SDLK_DELETE), + + const_iv (SDLK_FIRST), + const_iv (SDLK_LAST), const_iv (SDLK_KP0), const_iv (SDLK_KP1), const_iv (SDLK_KP2), @@ -601,6 +759,39 @@ const_iv (KMOD_NUM), const_iv (KMOD_CAPS), const_iv (KMOD_MODE), + + const_iv (KMOD_LRAM), + + const_iv (MIX_DEFAULT_FORMAT), + + const_iv (SDL_INIT_TIMER), + const_iv (SDL_INIT_AUDIO), + const_iv (SDL_INIT_VIDEO), + const_iv (SDL_INIT_CDROM), + const_iv (SDL_INIT_JOYSTICK), + const_iv (SDL_INIT_EVERYTHING), + const_iv (SDL_INIT_NOPARACHUTE), + const_iv (SDL_INIT_EVENTTHREAD), + + const_iv (SDL_GL_RED_SIZE), + const_iv (SDL_GL_GREEN_SIZE), + const_iv (SDL_GL_BLUE_SIZE), + const_iv (SDL_GL_ALPHA_SIZE), + const_iv (SDL_GL_DOUBLEBUFFER), + const_iv (SDL_GL_BUFFER_SIZE), + const_iv (SDL_GL_DEPTH_SIZE), + const_iv (SDL_GL_STENCIL_SIZE), + const_iv (SDL_GL_ACCUM_RED_SIZE), + const_iv (SDL_GL_ACCUM_GREEN_SIZE), + const_iv (SDL_GL_ACCUM_BLUE_SIZE), + const_iv (SDL_GL_ACCUM_ALPHA_SIZE), + const_iv (SDL_GL_STEREO), + const_iv (SDL_GL_MULTISAMPLEBUFFERS), + const_iv (SDL_GL_MULTISAMPLESAMPLES), + const_iv (SDL_GL_ACCELERATED_VISUAL), + const_iv (SDL_GL_SWAP_CONTROL), + + const_iv (FOW_DARKNESS) # undef const_iv }; @@ -628,6 +819,10 @@ NV ceil (NV x) +IV minpot (UV n) + +IV popcount (UV n) + void pango_init () CODE: @@ -635,16 +830,33 @@ opengl_fontmap = pango_opengl_font_map_new (); pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); + /*pango_context_set_font_description (opengl_context, default_font);*/ +#if PANGO_VERSION_CHECK (1, 15, 2) + pango_context_set_language (opengl_context, pango_language_from_string ("en")); + /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ +#endif } -char * -SDL_GetError () +char *SDL_GetError () -int -SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) +void SDL_braino () -void -SDL_Quit () +int SDL_Init (U32 flags) + +int SDL_InitSubSystem (U32 flags) + +void SDL_QuitSubSystem (U32 flags) + +void SDL_Quit () + +int SDL_GL_SetAttribute (int attr, int value) + +int SDL_GL_GetAttribute (int attr) + CODE: + if (SDL_GL_GetAttribute (attr, &RETVAL)) + XSRETURN_UNDEF; + OUTPUT: + RETVAL void SDL_ListModes (int rgb, int alpha) @@ -666,17 +878,14 @@ SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); -#if SDL_VERSION_ATLEAST(1,2,10) - SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); -#endif m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); if (m && m != (SDL_Rect **)-1) while (*m) { - if ((*m)->w >= 640 && (*m)->h >= 480) + if ((*m)->w >= 400 && (*m)->h >= 300) { AV *av = newAV (); av_push (av, newSViv ((*m)->w)); @@ -710,7 +919,7 @@ { av_clear (texture_av); - SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); + SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); #define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); #include "glfunc.h" #undef GL_FUNC @@ -728,6 +937,9 @@ int SDL_GetAppState () +int +SDL_GetModState () + void poll_events () PPCODE: @@ -746,8 +958,8 @@ case SDL_KEYUP: hv_store (hv, "state", 5, newSViv (ev.key.state), 0); hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); - hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); - hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ + hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0); + hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */ hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); break; @@ -775,7 +987,7 @@ SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); } - hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); + hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0); hv_store (hv, "state", 5, newSViv (state), 0); hv_store (hv, "x", 1, newSViv (x), 0); hv_store (hv, "y", 1, newSViv (y), 0); @@ -786,7 +998,7 @@ case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: - hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); + hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); hv_store (hv, "button", 6, newSViv (ev.button.button), 0); hv_store (hv, "state", 5, newSViv (ev.button.state), 0); @@ -801,17 +1013,33 @@ break; } - XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); + XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); } } int -Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) +Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) POSTCALL: Mix_HookMusicFinished (music_finished); Mix_ChannelFinished (channel_finished); void +Mix_QuerySpec () + PPCODE: +{ + int freq, channels; + Uint16 format; + + if (Mix_QuerySpec (&freq, &format, &channels)) + { + EXTEND (SP, 3); + PUSHs (sv_2mortal (newSViv (freq))); + PUSHs (sv_2mortal (newSViv (format))); + PUSHs (sv_2mortal (newSViv (channels))); + } +} + +void Mix_CloseAudio () int @@ -854,10 +1082,12 @@ #endif } -void +int add_font (char *file) CODE: - FcConfigAppFontAddFile (0, (const FcChar8 *)file); + RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); + OUTPUT: + RETVAL void load_image_inline (SV *image_) @@ -953,7 +1183,7 @@ CODE: fprintf (stderr, "ERROR: %s\n", message); #ifdef _WIN32 - MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); + MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR); #endif void @@ -961,7 +1191,7 @@ CODE: fprintf (stderr, "FATAL: %s\n", message); #ifdef _WIN32 - MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); + MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR); #endif _exit (1); @@ -983,11 +1213,18 @@ #endif } -MODULE = CFPlus PACKAGE = CFPlus::Font +int +SvREFCNT (SV *sv) + CODE: + RETVAL = SvREFCNT (sv); + OUTPUT: + RETVAL + +MODULE = Deliantra::Client PACKAGE = DC::Font PROTOTYPES: DISABLE -CFPlus::Font +DC::Font new_from_file (SV *class, char *path, int id = 0) CODE: { @@ -1000,27 +1237,33 @@ RETVAL void -DESTROY (CFPlus::Font self) +DESTROY (DC::Font self) CODE: pango_font_description_free (self); void -make_default (CFPlus::Font self) +make_default (DC::Font self) PROTOTYPE: $ CODE: default_font = self; -MODULE = CFPlus PACKAGE = CFPlus::Layout +MODULE = Deliantra::Client PACKAGE = DC::Layout PROTOTYPES: DISABLE void -reset_glyph_cache () +glyph_cache_backup () PROTOTYPE: CODE: - tc_clear (); + tc_backup (); -CFPlus::Layout +void +glyph_cache_restore () + PROTOTYPE: + CODE: + tc_restore (); + +DC::Layout new (SV *class) CODE: New (0, RETVAL, 1, struct cf_layout); @@ -1032,6 +1275,7 @@ RETVAL->a = 1.; RETVAL->base_height = MIN_FONT_HEIGHT; RETVAL->font = 0; + RETVAL->rc = rc_alloc (); pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); layout_update_font (RETVAL); @@ -1039,13 +1283,14 @@ RETVAL void -DESTROY (CFPlus::Layout self) +DESTROY (DC::Layout self) CODE: g_object_unref (self->pl); + rc_free (self->rc); Safefree (self); void -set_text (CFPlus::Layout self, SV *text_) +set_text (DC::Layout self, SV *text_) CODE: { STRLEN textlen; @@ -1055,7 +1300,7 @@ } void -set_markup (CFPlus::Layout self, SV *text_) +set_markup (DC::Layout self, SV *text_) CODE: { STRLEN textlen; @@ -1065,7 +1310,7 @@ } void -set_shapes (CFPlus::Layout self, ...) +set_shapes (DC::Layout self, ...) CODE: { PangoAttrList *attrs = 0; @@ -1110,14 +1355,14 @@ } void -get_shapes (CFPlus::Layout self) +get_shapes (DC::Layout self) PPCODE: { PangoLayoutIter *iter = pango_layout_get_iter (self->pl); do { - PangoLayoutRun *run = pango_layout_iter_get_run (iter); + PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter); if (run && shape_attr_p (run)) { @@ -1135,7 +1380,7 @@ } int -has_wrapped (CFPlus::Layout self) +has_wrapped (DC::Layout self) CODE: { int lines = 1; @@ -1150,7 +1395,7 @@ RETVAL SV * -get_text (CFPlus::Layout self) +get_text (DC::Layout self) CODE: RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); sv_utf8_decode (RETVAL); @@ -1158,7 +1403,7 @@ RETVAL void -set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) +set_foreground (DC::Layout self, float r, float g, float b, float a = 1.) CODE: self->r = r; self->g = g; @@ -1166,7 +1411,7 @@ self->a = a; void -set_font (CFPlus::Layout self, CFPlus::Font font = 0) +set_font (DC::Layout self, DC::Font font = 0) CODE: if (self->font != font) { @@ -1175,7 +1420,7 @@ } void -set_height (CFPlus::Layout self, int base_height) +set_height (DC::Layout self, int base_height) CODE: if (self->base_height != base_height) { @@ -1184,22 +1429,22 @@ } void -set_width (CFPlus::Layout self, int max_width = -1) +set_width (DC::Layout self, int max_width = -1) CODE: pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); void -set_indent (CFPlus::Layout self, int indent) +set_indent (DC::Layout self, int indent) CODE: pango_layout_set_indent (self->pl, indent * PANGO_SCALE); void -set_spacing (CFPlus::Layout self, int spacing) +set_spacing (DC::Layout self, int spacing) CODE: pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); void -set_ellipsise (CFPlus::Layout self, int ellipsise) +set_ellipsise (DC::Layout self, int ellipsise) CODE: pango_layout_set_ellipsize (self->pl, ellipsise == 1 ? PANGO_ELLIPSIZE_START @@ -1209,12 +1454,12 @@ ); void -set_single_paragraph_mode (CFPlus::Layout self, int spm) +set_single_paragraph_mode (DC::Layout self, int spm) CODE: pango_layout_set_single_paragraph_mode (self->pl, !!spm); void -size (CFPlus::Layout self) +size (DC::Layout self) PPCODE: { int w, h; @@ -1227,11 +1472,11 @@ } int -descent (CFPlus::Layout self) +descent (DC::Layout self) CODE: { PangoRectangle rect; - PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); + PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0); pango_layout_line_get_pixel_extents (line, 0, &rect); RETVAL = PANGO_DESCENT (rect); } @@ -1239,7 +1484,7 @@ RETVAL int -xy_to_index (CFPlus::Layout self, int x, int y) +xy_to_index (DC::Layout self, int x, int y) CODE: { int index, trailing; @@ -1250,34 +1495,36 @@ RETVAL void -cursor_pos (CFPlus::Layout self, int index) +cursor_pos (DC::Layout self, int index) PPCODE: { - PangoRectangle strong_pos; - pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); + PangoRectangle pos; + pango_layout_get_cursor_pos (self->pl, index, &pos, 0); EXTEND (SP, 3); - PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); - PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); - PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); + PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE))); + PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE))); + PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE))); } void -index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) +index_to_line_x (DC::Layout self, int index, int trailing = 0) PPCODE: { int line, x; pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); +#if !PANGO_VERSION_CHECK (1, 17, 3) /* pango bug: line is between 1..numlines, not 0..numlines-1 */ - + --line; +#endif EXTEND (SP, 2); - PUSHs (sv_2mortal (newSViv (line - 1))); + PUSHs (sv_2mortal (newSViv (line))); PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); } void -line_x_to_index (CFPlus::Layout self, int line, int x) +line_x_to_index (DC::Layout self, int line, int x) PPCODE: { PangoLayoutLine *lp; @@ -1286,7 +1533,7 @@ if (line < 0) XSRETURN_EMPTY; - if (!(lp = pango_layout_get_line (self->pl, line))) + if (!(lp = pango_layout_get_line_readonly (self->pl, line))) XSRETURN_EMPTY; /* do better */ pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); @@ -1302,20 +1549,42 @@ } void -render (CFPlus::Layout self, float x, float y, int flags = 0) - PPCODE: +render (DC::Layout self, float x, float y, int flags = 0) + CODE: + rc_clear (self->rc); pango_opengl_render_layout_subpixel ( self->pl, + self->rc, x * PANGO_SCALE, y * PANGO_SCALE, self->r, self->g, self->b, self->a, flags ); + // we assume that context_change actually clears/frees stuff + // and does not do any recomputation... + pango_layout_context_changed (self->pl); + +void +draw (DC::Layout self) + CODE: +{ + glEnable (GL_TEXTURE_2D); + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glEnable (GL_BLEND); + gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, + GL_ONE , GL_ONE_MINUS_SRC_ALPHA); + glEnable (GL_ALPHA_TEST); + glAlphaFunc (GL_GREATER, 7.f / 255.f); -MODULE = CFPlus PACKAGE = CFPlus::Texture + rc_draw (self->rc); -PROTOTYPES: ENABLE + glDisable (GL_ALPHA_TEST); + glDisable (GL_BLEND); + glDisable (GL_TEXTURE_2D); +} + +MODULE = Deliantra::Client PACKAGE = DC::Texture -int minpot (int n) +PROTOTYPES: ENABLE void pad (SV *data_, int ow, int oh, int nw, int nh) @@ -1352,6 +1621,9 @@ float t = SvNV (*hv_fetch (hv, "t", 1, 1)); int name = SvIV (*hv_fetch (hv, "name", 4, 1)); + if (name <= 0) + XSRETURN_EMPTY; + if (items < 5) { w = SvNV (*hv_fetch (hv, "w", 1, 1)); @@ -1399,11 +1671,11 @@ OUTPUT: RETVAL -MODULE = CFPlus PACKAGE = CFPlus::Map +MODULE = Deliantra::Client PACKAGE = DC::Map PROTOTYPES: DISABLE -CFPlus::Map +DC::Map new (SV *class) CODE: New (0, RETVAL, 1, struct map); @@ -1421,7 +1693,7 @@ RETVAL void -DESTROY (CFPlus::Map self) +DESTROY (DC::Map self) CODE: { map_clear (self); @@ -1431,18 +1703,18 @@ } void -resize (CFPlus::Map self, int map_width, int map_height) +resize (DC::Map self, int map_width, int map_height) CODE: self->w = map_width; self->h = map_height; void -clear (CFPlus::Map self) +clear (DC::Map self) CODE: map_clear (self); void -set_tileid (CFPlus::Map self, int face, int tile) +set_tileid (DC::Map self, int face, int tile) CODE: { need_facenum (self, face); self->face2tile [face] = tile; @@ -1450,7 +1722,7 @@ } void -set_smooth (CFPlus::Map self, int face, int smooth, int level) +set_smooth (DC::Map self, int face, int smooth, int level) CODE: { tileid texid; @@ -1473,7 +1745,7 @@ } void -set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) +set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) CODE: { need_texid (self, texid); @@ -1502,8 +1774,28 @@ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } +void +expire_textures (DC::Map self, int texid, int count) + PPCODE: + for (; texid < self->texs && count; ++texid, --count) + { + maptex *tex = self->tex + texid; + + if (tex->name) + { + if (tex->unused) + { + tex->name = 0; + tex->unused = 0; + XPUSHs (sv_2mortal (newSViv (texid))); + } + else + tex->unused = 1; + } + } + int -ox (CFPlus::Map self) +ox (DC::Map self) ALIAS: oy = 1 x = 2 @@ -1524,7 +1816,7 @@ RETVAL void -scroll (CFPlus::Map self, int dx, int dy) +scroll (DC::Map self, int dx, int dy) CODE: { if (dx > 0) @@ -1549,14 +1841,16 @@ } } -void -map1a_update (CFPlus::Map self, SV *data_, int extmap) +SV * +map1a_update (DC::Map self, SV *data_, int extmap) CODE: { uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); uint8_t *data_end = (uint8_t *)SvEND (data_); mapcell *cell; - int x, y, flags; + int x, y, z, flags; + AV *missing = newAV (); + RETVAL = newRV_noinc ((SV *)missing); while (data < data_end - 1) { @@ -1586,7 +1880,7 @@ do { ext = *data++; - cmd = ext & 0x3f; + cmd = ext & 0x7f; if (cmd < 4) cell->darkness = 255 - ext * 64 + 1; @@ -1599,8 +1893,10 @@ cell->stat_width = *data++ + 1; else if (cmd == 0x47) { - if (*data == 4) - ; // decode player count + if (*data == 1) cell->player = data [1]; + else if (*data == 2) cell->player = data [2] + (data [1] << 8); + else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16); + else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24); data += *data + 1; } @@ -1617,34 +1913,39 @@ cell->darkness = *data++ + 1; } - if (flags & 4) - { - faceid face = (data [0] << 8) + data [1]; data += 2; - need_facenum (self, face); - cell->tile [0] = self->face2tile [face]; - } + for (z = 0; z <= 2; ++z) + if (flags & (4 >> z)) + { + faceid face = (data [0] << 8) + data [1]; data += 2; + need_facenum (self, face); + cell->tile [z] = self->face2tile [face]; - if (flags & 2) - { - faceid face = (data [0] << 8) + data [1]; data += 2; - need_facenum (self, face); - cell->tile [1] = self->face2tile [face]; - } + if (cell->tile [z]) + { + maptex *tex = self->tex + cell->tile [z]; + tex->unused = 0; + if (!tex->name) + av_push (missing, newSViv (cell->tile [z])); - if (flags & 1) - { - faceid face = (data [0] << 8) + data [1]; data += 2; - need_facenum (self, face); - cell->tile [2] = self->face2tile [face]; - } + if (tex->smoothtile) + { + maptex *smooth = self->tex + tex->smoothtile; + smooth->unused = 0; + if (!smooth->name) + av_push (missing, newSViv (tex->smoothtile)); + } + } + } } else - cell->darkness = 0; + CELL_CLEAR (cell); } } + OUTPUT: + RETVAL SV * -mapmap (CFPlus::Map self, int x0, int y0, int w, int h) +mapmap (DC::Map self, int x0, int y0, int w, int h) CODE: { int x1, x; @@ -1699,33 +2000,38 @@ RETVAL void -draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) +draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) CODE: { + int x, y, z; + HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level - static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) + static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) smooth_key skey; - int x, y, z; - int last_name; + int pl_x, pl_y; + maptex pl_tex; + rc_t *rc = rc_alloc (); + rc_t *rc_ov = rc_alloc (); + rc_key_t key; + rc_array_t *arr, *arr_hidden; + + pl_tex.name = 0; - // thats current max. sorry. + // that's current max. sorry. if (sw > 255) sw = 255; if (sh > 255) sh = 255; // clear key, in case of extra padding memset (&skey, 0, sizeof (skey)); - glColor4ub (255, 255, 255, 255); - - glEnable (GL_BLEND); - glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable (GL_TEXTURE_2D); - glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - - glBegin (GL_QUADS); - - last_name = 0; + memset (&key, 0, sizeof (key)); + key.r = 255; + key.g = 255; + key.b = 255; + key.a = 255; + key.mode = GL_QUADS; + key.format = GL_T2F_V3F; mx += self->x; my += self->y; @@ -1752,9 +2058,17 @@ } } + glEnable (GL_BLEND); + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + + key.texname = self->tex [TEXID_HIDDEN].name; + arr_hidden = rc_array (rc_ov, &key); + for (z = 0; z <= 2; z++) { memset (smooth_level, 0, sizeof (smooth_level)); + key.texname = -1; for (y = 0; y < sh; y++) if (0 <= y + my && y + my < self->rows) @@ -1770,45 +2084,35 @@ if (tile) { maptex tex = self->tex [tile]; - int px = (x + 1) * T - tex.w; - int py = (y + 1) * T - tex.h; + int px, py; - // suppressing texture state switches here - // is only moderately effective, but worth the extra effort - if (last_name != tex.name) + if (key.texname != tex.name) { + self->tex [tile].unused = 0; + if (!tex.name) - tex = self->tex [2]; /* missing, replace by noface */ + tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ - glEnd (); - glBindTexture (GL_TEXTURE_2D, last_name = tex.name); - glBegin (GL_QUADS); + key.texname = tex.name; + arr = rc_array (rc, &key); } - glTexCoord2f (0 , 0 ); glVertex2f (px , py ); - glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); - glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); - glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); + px = (x + 1) * T - tex.w; + py = (y + 1) * T - tex.h; - if (cell->flags && z == 2) + if (expect_false (cell->player == player) && expect_false (z == 2)) { - if (cell->flags & 1) - { - maptex tex = self->tex [1]; - int px = x * T + T * 2 / 32; - int py = y * T - T * 6 / 32; - - glEnd (); - glBindTexture (GL_TEXTURE_2D, last_name = tex.name); - glBegin (GL_QUADS); - - glTexCoord2f (0 , 0 ); glVertex2f (px , py ); - glTexCoord2f (0 , tex.t); glVertex2f (px , py + T); - glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T); - glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py ); - } + pl_x = px; + pl_y = py; + pl_tex = tex; + continue; } + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); + // update smooth hash if (tex.smoothtile) { @@ -1848,14 +2152,56 @@ skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); } } + + if (expect_false (z == 2)) + { + /* draw question marks on top of hidden spaces */ + if (!cell->darkness) + { + maptex tex = self->tex [TEXID_HIDDEN]; + int px = (x + 1) * T - tex.w; + int py = (y + 1) * T - tex.h; + + rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0); + rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0); + rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0); + } + + if (expect_false (cell->flags)) + { + // overlays such as the speech bubble, probably more to come + if (cell->flags & 1) + { + rc_key_t key_ov = key; + maptex tex = self->tex [TEXID_SPEECH]; + rc_array_t *arr; + int px = x * T + T * 2 / 32; + int py = y * T - T * 6 / 32; + + key_ov.texname = tex.name; + arr = rc_array (rc_ov, &key_ov); + + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); + rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); + rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); + } + } + } } } + rc_draw (rc); + rc_clear (rc); + // go through all smoothlevels, lowest to highest, then draw. // this is basically counting sort { int w, b; + glEnable (GL_TEXTURE_2D); + glBegin (GL_QUADS); for (w = 0; w < 256 / 32; ++w) { uint32_t smask = smooth_level [w]; @@ -1884,50 +2230,75 @@ float dx = tex.s * .0625f; // 16 images/row float dy = tex.t * .5f ; // 2 images/column - // this time naively avoiding texture state changes - // save gobs of state changes. - if (last_name != tex.name) - { - if (!tex.name) - continue; // smoothing not yet available - - glEnd (); - glBindTexture (GL_TEXTURE_2D, last_name = tex.name); - glBegin (GL_QUADS); - } - - if (border) + if (tex.name) { - float ox = border * dx; - - glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); - glTexCoord2f (ox , dy ); glVertex2f (px , py + T); - glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); - glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); - } - - if (corner) - { - float ox = corner * dx; - - glTexCoord2f (ox , dy ); glVertex2f (px , py ); - glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); - glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); - glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); + // this time avoiding texture state changes + // save gobs of state changes. + if (key.texname != tex.name) + { + self->tex [skey->tile].unused = 0; + + glEnd (); + glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); + glBegin (GL_QUADS); + } + + if (border) + { + float ox = border * dx; + + glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); + glTexCoord2f (ox , dy ); glVertex2i (px , py + T); + glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); + glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); + } + + if (corner) + { + float ox = corner * dx; + + glTexCoord2f (ox , dy ); glVertex2i (px , py ); + glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); + glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); + glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); + } } } } } } + + glEnd (); + glDisable (GL_TEXTURE_2D); + key.texname = -1; } hv_clear (smooth); } - glEnd (); + if (pl_tex.name) + { + maptex tex = pl_tex; + int px = pl_x + sdx; + int py = pl_y + sdy; + + key.texname = tex.name; + arr = rc_array (rc, &key); + + rc_t2f_v3f (arr, 0 , 0 , px , py , 0); + rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); + rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); + + rc_draw (rc); + } + + rc_draw (rc_ov); + rc_clear (rc_ov); - glDisable (GL_TEXTURE_2D); glDisable (GL_BLEND); + rc_free (rc); + rc_free (rc_ov); // top layer: overlays such as the health bar for (y = 0; y < sh; y++) @@ -1943,6 +2314,12 @@ int px = x * T; int py = y * T; + if (expect_false (cell->player == player)) + { + px += sdx; + py += sdy; + } + if (cell->stat_hp) { int width = cell->stat_width * T; @@ -1962,7 +2339,7 @@ } void -draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) +draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) CODE: { static float color[16][3] = { @@ -2022,7 +2399,7 @@ } void -fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) +fow_texture (DC::Map self, int mx, int my, int sw, int sh) PPCODE: { int x, y; @@ -2040,7 +2417,7 @@ mx += self->x - 1; my += self->y - 1; - memset (darkness1, 255, sw1 * sh1); + memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1); for (y = 0; y < sh1; y++) if (0 <= y + my && y + my < self->rows) @@ -2103,7 +2480,7 @@ } SV * -get_rect (CFPlus::Map self, int x0, int y0, int w, int h) +get_rect (DC::Map self, int x0, int y0, int w, int h) CODE: { int x, y, x1, y1; @@ -2170,23 +2547,38 @@ } } - SvPOK_only (data_sv); - SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); - RETVAL = data_sv; + /* if size is w*h + 5 then no data has been found */ + if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) + { + SvPOK_only (data_sv); + SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); + } + + RETVAL = data_sv; } OUTPUT: RETVAL void -set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) +set_rect (DC::Map self, int x0, int y0, SV *data_sv) PPCODE: { int x, y, z; int w, h; int x1, y1; + STRLEN len; + uint8_t *data, *end; + + len = SvLEN (data_sv); + SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more + data = SvPVbyte_nolen (data_sv); + end = data + len + 8; + + if (len < 5) + XSRETURN_EMPTY; if (*data++ != 0) - return; /* version mismatch */ + XSRETURN_EMPTY; /* version mismatch */ w = *data++ << 8; w |= *data++; h = *data++ << 8; h |= *data++; @@ -2208,7 +2600,12 @@ for (x = x0; x < x1; x++) { - uint8_t flags = *data++; + uint8_t flags; + + if (data + 7 >= end) + XSRETURN_EMPTY; + + flags = *data++; if (flags) { @@ -2221,7 +2618,8 @@ if (cell->darkness == 0) { - cell->darkness = 0; + /*cell->darkness = 0;*/ + EXTEND (SP, 3); for (z = 0; z <= 2; z++) { @@ -2229,7 +2627,7 @@ if (t >= self->texs || (t && !self->tex [t].name)) { - XPUSHs (sv_2mortal (newSViv (t))); + PUSHs (sv_2mortal (newSViv (t))); need_texid (self, t); } @@ -2241,9 +2639,9 @@ } } -MODULE = CFPlus PACKAGE = CFPlus::RW +MODULE = Deliantra::Client PACKAGE = DC::RW -CFPlus::RW +DC::RW new (SV *class, SV *data_sv) CODE: { @@ -2255,7 +2653,7 @@ OUTPUT: RETVAL -CFPlus::RW +DC::RW new_from_file (SV *class, const char *path, const char *mode = "rb") CODE: RETVAL = SDL_RWFromFile (path, mode); @@ -2263,17 +2661,17 @@ RETVAL # fails on win32: -# CFPlus.xs(2268) : error C2059: syntax error : '(' +# dc.xs(2268) : error C2059: syntax error : '(' #void -#close (CFPlus::RW self) +#close (DC::RW self) # CODE: # (self->(close)) (self); -MODULE = CFPlus PACKAGE = CFPlus::Channel +MODULE = Deliantra::Client PACKAGE = DC::Channel PROTOTYPES: DISABLE -CFPlus::Channel +DC::Channel find () CODE: { @@ -2296,72 +2694,80 @@ RETVAL void -halt (CFPlus::Channel self) +halt (DC::Channel self) CODE: Mix_HaltChannel (self); void -expire (CFPlus::Channel self, int ticks = -1) +expire (DC::Channel self, int ticks = -1) CODE: Mix_ExpireChannel (self, ticks); void -fade_out (CFPlus::Channel self, int ticks = -1) +fade_out (DC::Channel self, int ticks = -1) CODE: Mix_FadeOutChannel (self, ticks); int -volume (CFPlus::Channel self, int volume) +volume (DC::Channel self, int volume) CODE: RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); OUTPUT: RETVAL void -unregister_all_effects (CFPlus::Channel self) +unregister_all_effects (DC::Channel self) CODE: Mix_UnregisterAllEffects (self); void -set_panning (CFPlus::Channel self, int left, int right) +set_panning (DC::Channel self, int left, int right) CODE: left = CLAMP (left , 0, 255); right = CLAMP (right, 0, 255); Mix_SetPanning (self, left, right); void -set_distance (CFPlus::Channel self, int distance) +set_distance (DC::Channel self, int distance) CODE: Mix_SetDistance (self, CLAMP (distance, 0, 255)); void -set_position (CFPlus::Channel self, int angle, int distance) +set_position (DC::Channel self, int angle, int distance) CODE: + +void +set_position_r (DC::Channel self, int dx, int dy, int maxdistance) + CODE: +{ + int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); + int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); +} void -set_reverse_stereo (CFPlus::Channel self, int flip) +set_reverse_stereo (DC::Channel self, int flip) CODE: Mix_SetReverseStereo (self, flip); -MODULE = CFPlus PACKAGE = CFPlus::MixChunk +MODULE = Deliantra::Client PACKAGE = DC::MixChunk PROTOTYPES: DISABLE -CFPlus::MixChunk -new (SV *class, CFPlus::RW rwops) +DC::MixChunk +new (SV *class, DC::RW rwops) CODE: RETVAL = Mix_LoadWAV_RW (rwops, 1); OUTPUT: RETVAL void -DESTROY (CFPlus::MixChunk self) +DESTROY (DC::MixChunk self) CODE: Mix_FreeChunk (self); int -volume (CFPlus::MixChunk self, int volume = -1) +volume (DC::MixChunk self, int volume = -1) CODE: if (items > 1) volume = CLAMP (volume, 0, 128); @@ -2369,8 +2775,8 @@ OUTPUT: RETVAL -CFPlus::Channel -play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) +DC::Channel +play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1) CODE: { RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); @@ -2387,7 +2793,7 @@ OUTPUT: RETVAL -MODULE = CFPlus PACKAGE = CFPlus::MixMusic +MODULE = Deliantra::Client PACKAGE = DC::MixMusic int volume (int volume = -1) @@ -2409,37 +2815,37 @@ CODE: Mix_HaltMusic (); -CFPlus::MixMusic -new (SV *class, CFPlus::RW rwops) +DC::MixMusic +new (SV *class, DC::RW rwops) CODE: RETVAL = Mix_LoadMUS_RW (rwops); OUTPUT: RETVAL void -DESTROY (CFPlus::MixMusic self) +DESTROY (DC::MixMusic self) CODE: Mix_FreeMusic (self); int -play (CFPlus::MixMusic self, int loops = -1) +play (DC::MixMusic self, int loops = -1) CODE: RETVAL = Mix_PlayMusic (self, loops); OUTPUT: RETVAL void -fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) +fade_in_pos (DC::MixMusic self, int loops, int ms, double position) CODE: Mix_FadeInMusicPos (self, loops, ms, position); -MODULE = CFPlus PACKAGE = CFPlus::OpenGL +MODULE = Deliantra::Client PACKAGE = DC::OpenGL PROTOTYPES: ENABLE BOOT: { - HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); + HV *stash = gv_stashpv ("DC::OpenGL", 1); static const struct { const char *name; IV iv; @@ -2484,6 +2890,12 @@ const_iv (GL_LUMINANCE_ALPHA), const_iv (GL_FLOAT), const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), + const_iv (GL_COMPRESSED_ALPHA_ARB), + const_iv (GL_COMPRESSED_LUMINANCE_ARB), + const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB), + const_iv (GL_COMPRESSED_INTENSITY_ARB), + const_iv (GL_COMPRESSED_RGB_ARB), + const_iv (GL_COMPRESSED_RGBA_ARB), const_iv (GL_COMPILE), const_iv (GL_PROXY_TEXTURE_1D), const_iv (GL_PROXY_TEXTURE_2D), @@ -2532,6 +2944,7 @@ const_iv (GL_LINE_SMOOTH_HINT), const_iv (GL_POLYGON_SMOOTH_HINT), const_iv (GL_GENERATE_MIPMAP_HINT), + const_iv (GL_TEXTURE_COMPRESSION_HINT), const_iv (GL_FASTEST), const_iv (GL_DONT_CARE), const_iv (GL_NICEST), @@ -2549,6 +2962,12 @@ AvREAL_off (texture_av); } +void +disable_GL_EXT_blend_func_separate () + CODE: + gl.BlendFuncSeparate = 0; + gl.BlendFuncSeparateEXT = 0; + char * gl_vendor () CODE: @@ -2650,6 +3069,7 @@ glRotatef (angle, x, y, z); void glColor (float r, float g, float b, float a = 1.0) + PROTOTYPE: @ ALIAS: glColor_premultiply = 1 CODE: @@ -2679,6 +3099,15 @@ CODE: glRectf (x1, y1, x2, y2); +void glRect_lineloop (float x1, float y1, float x2, float y2) + CODE: + glBegin (GL_LINE_LOOP); + glVertex2f (x1, y1); + glVertex2f (x2, y1); + glVertex2f (x2, y2); + glVertex2f (x1, y2); + glEnd (); + PROTOTYPES: ENABLE void glBegin (int mode) @@ -2720,7 +3149,7 @@ if (gl.SeparableFilter2D) gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); -void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) +void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0) void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) @@ -2756,7 +3185,7 @@ void glCallList (int list) -MODULE = CFPlus PACKAGE = CFPlus::UI::Base +MODULE = Deliantra::Client PACKAGE = DC::UI::Base PROTOTYPES: DISABLE @@ -2770,12 +3199,12 @@ BOOT: { - hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); + hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV); - draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); - draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); - draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); - draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); + draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV); + draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV); + draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV); + draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV); } void @@ -2789,16 +3218,15 @@ SV *draw_y_sv = GvSV (draw_y_gv); SV *draw_w_sv = GvSV (draw_w_gv); SV *draw_h_sv = GvSV (draw_h_gv); - SV *hover; - double draw_x, draw_y, draw_w, draw_h; + double draw_x, draw_y; if (!SvROK (self)) - croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); + croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self)); hv = (HV *)SvRV (self); if (SvTYPE (hv) != SVt_PVHV) - croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); + croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self)); svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; @@ -2828,7 +3256,7 @@ if (svp && SvTRUE (*svp)) { - glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); + glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f); glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBegin (GL_QUADS); @@ -2841,19 +3269,17 @@ } } #if 0 - if ($ENV{CFPLUS_DEBUG} & 1) { - glPushMatrix; - glColor 1, 1, 0, 1; - glTranslate 0.375, 0.375; - glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex $self->{w} - 1, 0; - glVertex $self->{w} - 1, $self->{h} - 1; - glVertex 0 , $self->{h} - 1; - glEnd; - glPopMatrix; - #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; - } + // draw borders, for debugging + glPushMatrix (); + glColor4f (1., 1., 0., 1.); + glTranslatef (.5, .5, 0.); + glBegin (GL_LINE_LOOP); + glVertex2f (0 , 0); + glVertex2f (w - 1, 0); + glVertex2f (w - 1, h - 1); + glVertex2f (0 , h - 1); + glEnd (); + glPopMatrix (); #endif PUSHMARK (SP); XPUSHs (self);