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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

… …
41#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42 42
43/* work around os x broken headers */ 43/* work around os x broken headers */
44#ifdef __MACOSX__ 44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46#endif 48#endif
47 49
48#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
50 52
… …
97 99
98#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
99 101
100#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3 104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
103 123
104static AV *texture_av; 124static AV *texture_av;
105 125
106static struct 126static struct
107{ 127{
… …
459 ev.code = 1; 479 ev.code = 1;
460 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
461 ev.data2 = 0; 481 ev.data2 = 0;
462 482
463 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
464} 490}
465 491
466static unsigned int 492static unsigned int
467minpot (unsigned int n) 493minpot (unsigned int n)
468{ 494{
… …
929 955
930 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
931#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
932#include "glfunc.h" 958#include "glfunc.h"
933#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
934 } 963 }
935} 964}
936 OUTPUT: 965 OUTPUT:
937 RETVAL 966 RETVAL
938 967
… …
1023 1052
1024 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1025 } 1054 }
1026} 1055}
1027 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
1028int 1070int
1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1030 POSTCALL: 1072 POSTCALL:
1031 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
1032 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
… …
1094add_font (char *file) 1136add_font (char *file)
1095 CODE: 1137 CODE:
1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT: 1139 OUTPUT:
1098 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1099 1144
1100void 1145void
1101load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
1102 ALIAS: 1147 ALIAS:
1103 load_image_file = 1 1148 load_image_file = 1
… …
1671void 1716void
1672draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1) 1717draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1673 PROTOTYPE: @ 1718 PROTOTYPE: @
1674 CODE: 1719 CODE:
1675{ 1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1676 glEnable (GL_TEXTURE_2D); 1723 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1); 1724 glBindTexture (GL_TEXTURE_2D, name1);
1680 1725
1681 glColor3f (intensity, intensity, intensity); 1726 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix (); 1727 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.); 1728 glScalef (1./3, 1./3, 1.);
… …
1698 glBindTexture (GL_TEXTURE_2D, name2); 1743 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700 1745
1701 /* rgb == rgb(glcolor) */ 1746 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705 1750
1706 /* alpha = interpolate t0, t1 by env_alpha */ 1751 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708 1753
… …
2095 ? self->row + y 2140 ? self->row + y
2096 : 0; 2141 : 0;
2097 2142
2098 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
2099 { 2144 {
2100 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
2101 2146
2102 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
2103 { 2148 {
2104 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
2105 2150
… …
2107 { 2152 {
2108 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
2109 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
2110 int a1 = tex.a; 2155 int a1 = tex.a;
2111 2156
2112 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
2113 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
2114 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
2115 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
2116 } 2161 }
2117 } 2162 }
2118 2163
2119 *map++ = (r ) 2164 *map++ = (r )
2120 | (g << 8) 2165 | (g << 8)
… …
2127} 2172}
2128 OUTPUT: 2173 OUTPUT:
2129 RETVAL 2174 RETVAL
2130 2175
2131void 2176void
2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2133 CODE: 2178 CODE:
2134{ 2179{
2135 int x, y, z; 2180 int x, y, z;
2136 2181
2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2141 int pl_x, pl_y; 2186 int pl_x, pl_y;
2142 maptex pl_tex; 2187 maptex pl_tex;
2143 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc (); 2189 rc_t *rc_ov = rc_alloc ();
2145 rc_key_t key; 2190 rc_key_t key;
2146 rc_array_t *arr, *arr_hidden; 2191 rc_array_t *arr;
2147 2192
2148 pl_tex.name = 0; 2193 pl_tex.name = 0;
2149 2194
2150 // that's current max. sorry. 2195 // that's current max. sorry.
2151 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
… …
2188 } 2233 }
2189 2234
2190 glEnable (GL_BLEND); 2235 glEnable (GL_BLEND);
2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196 2238
2197 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
2198 { 2240 {
2199 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1; 2242 key.texname = -1;
… …
2224 2266
2225 key.texname = tex.name; 2267 key.texname = tex.name;
2226 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
2227 } 2269 }
2228 2270
2229 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
2230 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
2231 2273
2232 if (expect_false (cell->player == player) && expect_false (z == 2)) 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
2233 { 2275 {
2234 pl_x = px; 2276 pl_x = px;
2235 pl_y = py; 2277 pl_y = py;
… …
2288 if (cell->flags & 1) 2330 if (cell->flags & 1)
2289 { 2331 {
2290 rc_key_t key_ov = key; 2332 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH]; 2333 maptex tex = self->tex [TEXID_SPEECH];
2292 rc_array_t *arr; 2334 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32; 2335 int px = x * Tw + Tw * 2 / 32;
2294 int py = y * T - T * 6 / 32; 2336 int py = y * Th - Th * 6 / 32;
2295 2337
2296 key_ov.texname = tex.name; 2338 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov); 2339 arr = rc_array (rc_ov, &key_ov);
2298 2340
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2303 } 2345 }
2304 } 2346 }
2305 } 2347 }
2306 } 2348 }
2307 2349
… …
2334 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
2335 && skey->level == level 2377 && skey->level == level
2336 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
2337 { 2379 {
2338 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
2339 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
2340 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
2341 int border = bits & 15; 2383 int border = bits & 15;
2342 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2343 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
2344 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
2345 2387
… …
2358 2400
2359 if (border) 2401 if (border)
2360 { 2402 {
2361 float ox = border * dx; 2403 float ox = border * dx;
2362 2404
2363 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2364 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2365 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2366 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2367 } 2409 }
2368 2410
2369 if (corner) 2411 if (corner)
2370 { 2412 {
2371 float ox = corner * dx; 2413 float ox = corner * dx;
2372 2414
2373 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2374 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2375 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2376 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2377 } 2419 }
2378 } 2420 }
2379 } 2421 }
2380 } 2422 }
2381 } 2423 }
… …
2422 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2423 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2424 { 2466 {
2425 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2426 2468
2427 int px = x * T; 2469 int px = x * Tw;
2428 int py = y * T; 2470 int py = y * Th;
2429 2471
2430 if (expect_false (cell->player == player)) 2472 if (expect_false (cell->player == player))
2431 { 2473 {
2432 px += sdx; 2474 px += sdx;
2433 py += sdy; 2475 py += sdy;
2434 } 2476 }
2435 2477
2436 if (cell->stat_hp) 2478 if (cell->stat_hp)
2437 { 2479 {
2438 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2440 2482
2441 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2442 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2443 px + width - 1, py); 2485 px + width - 1, py);
2444 2486
… …
2797 if (RETVAL < 0) 2839 if (RETVAL < 0)
2798 { 2840 {
2799 RETVAL = Mix_GroupOldest (-1); 2841 RETVAL = Mix_GroupOldest (-1);
2800 2842
2801 if (RETVAL < 0) 2843 if (RETVAL < 0)
2844 {
2845 // happens sometimes, maybe it just stopped playing(?)
2846 RETVAL = Mix_GroupAvailable (-1);
2847
2848 if (RETVAL < 0)
2802 XSRETURN_UNDEF; 2849 XSRETURN_UNDEF;
2803 2850 }
2851 else
2804 Mix_HaltChannel (RETVAL); 2852 Mix_HaltChannel (RETVAL);
2805 } 2853 }
2806 2854
2807 Mix_UnregisterAllEffects (RETVAL); 2855 Mix_UnregisterAllEffects (RETVAL);
2808 Mix_Volume (RETVAL, 128); 2856 Mix_Volume (RETVAL, 128);
2809} 2857}
… …
2868 Mix_SetReverseStereo (self, flip); 2916 Mix_SetReverseStereo (self, flip);
2869 2917
2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2918MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2871 2919
2872PROTOTYPES: DISABLE 2920PROTOTYPES: DISABLE
2921
2922void
2923decoders ()
2924 PPCODE:
2925#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2926 int i, num = Mix_GetNumChunkDecoders ();
2927 EXTEND (SP, num);
2928 for (i = 0; i < num; ++i)
2929 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2930#else
2931 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2932#endif
2873 2933
2874DC::MixChunk 2934DC::MixChunk
2875new (SV *class, DC::RW rwops) 2935new (SV *class, DC::RW rwops)
2876 CODE: 2936 CODE:
2877 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2937 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2910 OUTPUT: 2970 OUTPUT:
2911 RETVAL 2971 RETVAL
2912 2972
2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2973MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2914 2974
2975void
2976decoders ()
2977 PPCODE:
2978#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2979 int i, num = Mix_GetNumMusicDecoders ();
2980 EXTEND (SP, num);
2981 for (i = 0; i < num; ++i)
2982 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2983#else
2984 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2985#endif
2986
2915int 2987int
2916volume (int volume = -1) 2988volume (int volume = -1)
2917 PROTOTYPE: ;$ 2989 PROTOTYPE: ;$
2918 CODE: 2990 CODE:
2919 if (items > 0) 2991 if (items > 0)
… …
2929 3001
2930void 3002void
2931halt () 3003halt ()
2932 CODE: 3004 CODE:
2933 Mix_HaltMusic (); 3005 Mix_HaltMusic ();
3006
3007int
3008playing ()
3009 CODE:
3010 RETVAL = Mix_PlayingMusic ();
3011 OUTPUT:
3012 RETVAL
2934 3013
2935DC::MixMusic 3014DC::MixMusic
2936new (SV *class, DC::RW rwops) 3015new (SV *class, DC::RW rwops)
2937 CODE: 3016 CODE:
2938 RETVAL = Mix_LoadMUS_RW (rwops); 3017 RETVAL = Mix_LoadMUS_RW (rwops);
… …
3133 3212
3134int glGetError () 3213int glGetError ()
3135 3214
3136void glFinish () 3215void glFinish ()
3137 3216
3217void glFlush ()
3218
3138void glClear (int mask) 3219void glClear (int mask)
3139 3220
3140void glClearColor (float r, float g, float b, float a = 1.0) 3221void glClearColor (float r, float g, float b, float a = 1.0)
3141 PROTOTYPE: @ 3222 PROTOTYPE: @
3142 3223

Diff Legend

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