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.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC

… …
99 99
100#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
101 101
102#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
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}
104 123
105static AV *texture_av; 124static AV *texture_av;
106 125
107static struct 126static struct
108{ 127{
… …
460 ev.code = 1; 479 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 481 ev.data2 = 0;
463 482
464 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;
465} 490}
466 491
467static unsigned int 492static unsigned int
468minpot (unsigned int n) 493minpot (unsigned int n)
469{ 494{
… …
796 821
797 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
798# undef const_iv 823# undef const_iv
799 }; 824 };
800 825
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 828
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 831}
807 832
… …
1111add_font (char *file) 1136add_font (char *file)
1112 CODE: 1137 CODE:
1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT: 1139 OUTPUT:
1115 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
1116 1147
1117void 1148void
1118load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
1119 ALIAS: 1150 ALIAS:
1120 load_image_file = 1 1151 load_image_file = 1
… …
2112 ? self->row + y 2143 ? self->row + y
2113 : 0; 2144 : 0;
2114 2145
2115 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
2116 { 2147 {
2117 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
2118 2149
2119 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
2120 { 2151 {
2121 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
2122 2153
… …
2124 { 2155 {
2125 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
2126 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
2127 int a1 = tex.a; 2158 int a1 = tex.a;
2128 2159
2129 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
2130 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
2131 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
2132 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
2133 } 2164 }
2134 } 2165 }
2135 2166
2136 *map++ = (r ) 2167 *map++ = (r )
2137 | (g << 8) 2168 | (g << 8)
… …
2144} 2175}
2145 OUTPUT: 2176 OUTPUT:
2146 RETVAL 2177 RETVAL
2147 2178
2148void 2179void
2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2180draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2150 CODE: 2181 CODE:
2151{ 2182{
2152 int x, y, z; 2183 int x, y, z;
2153 2184
2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2238 2269
2239 key.texname = tex.name; 2270 key.texname = tex.name;
2240 arr = rc_array (rc, &key); 2271 arr = rc_array (rc, &key);
2241 } 2272 }
2242 2273
2243 px = (x + 1) * T - tex.w; 2274 px = (x + 1) * Th - tex.w;
2244 py = (y + 1) * T - tex.h; 2275 py = (y + 1) * Tw - tex.h;
2245 2276
2246 if (expect_false (cell->player == player) && expect_false (z == 2)) 2277 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 { 2278 {
2248 pl_x = px; 2279 pl_x = px;
2249 pl_y = py; 2280 pl_y = py;
… …
2302 if (cell->flags & 1) 2333 if (cell->flags & 1)
2303 { 2334 {
2304 rc_key_t key_ov = key; 2335 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH]; 2336 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr; 2337 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32; 2338 int px = x * Tw + Tw * 2 / 32;
2308 int py = y * T - T * 6 / 32; 2339 int py = y * Th - Th * 6 / 32;
2309 2340
2310 key_ov.texname = tex.name; 2341 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov); 2342 arr = rc_array (rc_ov, &key_ov);
2312 2343
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2317 } 2348 }
2318 } 2349 }
2319 } 2350 }
2320 } 2351 }
2321 2352
… …
2348 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
2349 && skey->level == level 2380 && skey->level == level
2350 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
2351 { 2382 {
2352 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
2353 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
2354 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
2355 int border = bits & 15; 2386 int border = bits & 15;
2356 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
2358 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
2359 2390
… …
2372 2403
2373 if (border) 2404 if (border)
2374 { 2405 {
2375 float ox = border * dx; 2406 float ox = border * dx;
2376 2407
2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381 } 2412 }
2382 2413
2383 if (corner) 2414 if (corner)
2384 { 2415 {
2385 float ox = corner * dx; 2416 float ox = corner * dx;
2386 2417
2387 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391 } 2422 }
2392 } 2423 }
2393 } 2424 }
2394 } 2425 }
2395 } 2426 }
… …
2436 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
2437 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
2438 { 2469 {
2439 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
2440 2471
2441 int px = x * T; 2472 int px = x * Tw;
2442 int py = y * T; 2473 int py = y * Th;
2443 2474
2444 if (expect_false (cell->player == player)) 2475 if (expect_false (cell->player == player))
2445 { 2476 {
2446 px += sdx; 2477 px += sdx;
2447 py += sdy; 2478 py += sdy;
2448 } 2479 }
2449 2480
2450 if (cell->stat_hp) 2481 if (cell->stat_hp)
2451 { 2482 {
2452 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454 2485
2455 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
2456 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
2457 px + width - 1, py); 2488 px + width - 1, py);
2458 2489
… …
2538 int x, y; 2569 int x, y;
2539 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2540 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2541 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2542 int sw3 = sw * 3; 2573 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2577 memset (darkness1, 0, sw1*sh1);
2546 2578
2547 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2548 SvCUR_set (darkness3_sv, sw3 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2549 2581
2550 mx += self->x - 1; 2582 mx += self->x - 1;
… …
3129 const_iv (GL_FUNC_SUBTRACT), 3161 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131# undef const_iv 3163# undef const_iv
3132 }; 3164 };
3133 3165
3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136 3168
3137 texture_av = newAV (); 3169 texture_av = newAV ();
3138 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
3139} 3171}
3140 3172
… …
3183 RETVAL 3215 RETVAL
3184 3216
3185int glGetError () 3217int glGetError ()
3186 3218
3187void glFinish () 3219void glFinish ()
3220
3221void glFlush ()
3188 3222
3189void glClear (int mask) 3223void glClear (int mask)
3190 3224
3191void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
3192 PROTOTYPE: @ 3226 PROTOTYPE: @

Diff Legend

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