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.163 by root, Wed Oct 18 12:53:45 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

… …
1168} 1168}
1169 1169
1170MODULE = CFPlus PACKAGE = CFPlus::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1171 1171
1172CFPlus::Map 1172CFPlus::Map
1173new (SV *class, int map_width, int map_height) 1173new (SV *class)
1174 CODE: 1174 CODE:
1175 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1176 RETVAL->x = 0; 1176 RETVAL->x = 0;
1177 RETVAL->y = 0; 1177 RETVAL->y = 0;
1178 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1179 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1180 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1181 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1182 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1183 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1184 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
… …
1195 map_clear (self); 1195 map_clear (self);
1196 Safefree (self->face); 1196 Safefree (self->face);
1197 Safefree (self->tex); 1197 Safefree (self->tex);
1198 Safefree (self); 1198 Safefree (self);
1199} 1199}
1200
1201void
1202resize (CFPlus::Map self, int map_width, int map_height)
1203 CODE:
1204 self->w = map_width;
1205 self->h = map_height;
1200 1206
1201void 1207void
1202clear (CFPlus::Map self) 1208clear (CFPlus::Map self)
1203 CODE: 1209 CODE:
1204 map_clear (self); 1210 map_clear (self);
… …
1444} 1450}
1445 OUTPUT: 1451 OUTPUT:
1446 RETVAL 1452 RETVAL
1447 1453
1448void 1454void
1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1450 CODE: 1456 CODE:
1451{ 1457{
1452 int vx, vy;
1453 int x, y, z; 1458 int x, y, z;
1454 int last_name; 1459 int last_name;
1455 mapface face; 1460 mapface face;
1456
1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1459
1460 /*
1461 int vx = self->vx = self->w >= sw
1462 ? self->x + (self->w - sw) / 2
1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1464
1465 int vy = self->vy = self->h >= sh
1466 ? self->y + (self->h - sh) / 2
1467 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1468 */
1469 1461
1470 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1471 1463
1472 glEnable (GL_BLEND); 1464 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1476 1468
1477 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1478 1470
1479 last_name = 0; 1471 last_name = 0;
1480 1472
1473 mx += self->x;
1474 my += self->y;
1475
1481 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1482 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1483 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1484 { 1479 {
1485 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1486 1481
1487 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1488 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1489 { 1484 {
1490 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1491 1486
1492 face = cell->face [z]; 1487 face = cell->face [z];
1493 1488
1494 if (face && face < self->texs) 1489 if (face && face < self->texs)
1495 { 1490 {
… …
1536 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1537 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1538 1533
1539 // top layer: overlays such as the health bar 1534 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++) 1535 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows) 1536 if (0 <= y + my && y + my < self->rows)
1542 { 1537 {
1543 maprow *row = self->row + (y + vy); 1538 maprow *row = self->row + (y + my);
1544 1539
1545 for (x = 0; x < sw; x++) 1540 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1) 1541 if (row->c0 <= x + mx && x + mx < row->c1)
1547 { 1542 {
1548 mapcell *cell = row->col + (x + vx - row->c0); 1543 mapcell *cell = row->col + (x + mx - row->c0);
1549 1544
1550 int px = x * 32; 1545 int px = x * 32;
1551 int py = y * 32; 1546 int py = y * 32;
1552 1547
1553 if (cell->stat_hp) 1548 if (cell->stat_hp)
… …
1627 glDisable (GL_BLEND); 1622 glDisable (GL_BLEND);
1628 glDisable (GL_TEXTURE_2D); 1623 glDisable (GL_TEXTURE_2D);
1629} 1624}
1630 1625
1631void 1626void
1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1627fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1633 PPCODE: 1628 PPCODE:
1634{ 1629{
1635 int vx, vy;
1636 int x, y; 1630 int x, y;
1637 int sw4 = (sw + 3) & ~3; 1631 int sw4 = (sw + 3) & ~3;
1638 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1639 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1640 1634
1641 memset (darkness, 255, sw4 * sh); 1635 memset (darkness, 255, sw4 * sh);
1642 SvPOK_only (darkness_sv); 1636 SvPOK_only (darkness_sv);
1643 SvCUR_set (darkness_sv, sw4 * sh); 1637 SvCUR_set (darkness_sv, sw4 * sh);
1644 1638
1645 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1639 mx += self->x;
1646 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1640 my += self->y;
1647 1641
1648 for (y = 0; y < sh; y++) 1642 for (y = 0; y < sh; y++)
1649 if (0 <= y + vy && y + vy < self->rows) 1643 if (0 <= y + my && y + my < self->rows)
1650 { 1644 {
1651 maprow *row = self->row + (y + vy); 1645 maprow *row = self->row + (y + my);
1652 1646
1653 for (x = 0; x < sw; x++) 1647 for (x = 0; x < sw; x++)
1654 if (row->c0 <= x + vx && x + vx < row->c1) 1648 if (row->c0 <= x + mx && x + mx < row->c1)
1655 { 1649 {
1656 mapcell *cell = row->col + (x + vx - row->c0); 1650 mapcell *cell = row->col + (x + mx - row->c0);
1657 1651
1658 darkness[y * sw4 + x] = cell->darkness 1652 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1) 1653 ? 255 - (cell->darkness - 1)
1660 : 255 - FOW_DARKNESS; 1654 : 255 - FOW_DARKNESS;
1661 } 1655 }

Diff Legend

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