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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

… …
436 436
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 439}
440 440
441NV floor (NV x)
442
443NV ceil (NV x)
444
441void 445void
442pango_init () 446pango_init ()
443 CODE: 447 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx 448 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 449{
… …
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 488
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 491
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
1038 } 1042 }
1039 } 1043 }
1040} 1044}
1041 1045
1042void 1046void
1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1047draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044 PROTOTYPE: $$$;$$ 1048 PROTOTYPE: $$$;$$
1045 ALIAS: 1049 ALIAS:
1046 draw_quad_alpha = 1 1050 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1051 draw_quad_alpha_premultiplied = 2
1048 CODE: 1052 CODE:
… …
1330 OUTPUT: 1334 OUTPUT:
1331 RETVAL 1335 RETVAL
1332 1336
1333void 1337void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335 PPCODE: 1339 CODE:
1336{ 1340{
1337 int vx, vy; 1341 int vx, vy;
1338 int x, y, z; 1342 int x, y, z;
1339 int last_name; 1343 int last_name;
1340 mapface face; 1344 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344 1345
1345 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh);
1348
1349 vx = self->x + (self->w - sw) / 2 - shift_x; 1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1351 1348
1352 /* 1349 /*
1353 int vx = self->vx = self->w >= sw 1350 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2 1351 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
… …
1378 1375
1379 for (x = 0; x < sw; x++) 1376 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1377 if (row->c0 <= x + vx && x + vx < row->c1)
1381 { 1378 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1379 mapcell *cell = row->col + (x + vx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387 1380
1388 face = cell->face [z]; 1381 face = cell->face [z];
1389 1382
1390 if (face) 1383 if (face)
1391 { 1384 {
… …
1412 1405
1413 glEnd (); 1406 glEnd ();
1414 1407
1415 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1409 glDisable (GL_BLEND);
1410}
1411
1412void
1413fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1414 PPCODE:
1415{
1416 int vx, vy;
1417 int x, y;
1418 int sw4 = (sw + 3) & ~3;
1419 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1420 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1421
1422 memset (darkness, 255, sw4 * sh);
1423 SvPOK_only (darkness_sv);
1424 SvCUR_set (darkness_sv, sw4 * sh);
1425
1426 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1427 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1428
1429 for (y = 0; y < sh; y++)
1430 if (0 <= y + vy && y + vy < self->rows)
1431 {
1432 maprow *row = self->row + (y + vy);
1433
1434 for (x = 0; x < sw; x++)
1435 if (row->c0 <= x + vx && x + vx < row->c1)
1436 {
1437 mapcell *cell = row->col + (x + vx - row->c0);
1438
1439 darkness[y * sw4 + x] = cell->darkness < 0
1440 ? 255 - FOW_DARKNESS
1441 : 255 - cell->darkness;
1442 }
1443 }
1417 1444
1418 EXTEND (SP, 3); 1445 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1446 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1447 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1448 PUSHs (darkness_sv);
… …
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1665 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 1666 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 1667 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 1668 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 1669 const_iv (GL_RGBA),
1670 const_iv (GL_RGBA4),
1671 const_iv (GL_RGBA8),
1672 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 1673 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 1674 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 1675 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 1676 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 1677 const_iv (GL_INTENSITY),
… …
1721 OUTPUT: 1751 OUTPUT:
1722 RETVAL 1752 RETVAL
1723 1753
1724int glGetError () 1754int glGetError ()
1725 1755
1756void glFinish ()
1757
1726void glClear (int mask) 1758void glClear (int mask)
1727 1759
1728void glClearColor (float r, float g, float b, float a = 1.0) 1760void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 1761 PROTOTYPE: @
1730 1762

Diff Legend

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