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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.224 by root, Sat Aug 11 11:21:46 2007 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
… …
109 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
111} 116}
112 117
113#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
114 120
115#include "pango-font.c" 121#include "pango-font.c"
116#include "pango-fontmap.c" 122#include "pango-fontmap.c"
117#include "pango-render.c" 123#include "pango-render.c"
118 124
… …
1350 HV *hv = (HV *)SvRV (self); 1356 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1357 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1358 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1359 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1360
1361 if (name <= 0)
1362 XSRETURN_EMPTY;
1363
1355 if (items < 5) 1364 if (items < 5)
1356 { 1365 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1366 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1367 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1368 }
… …
1547 self->rows += MAP_EXTEND_Y; 1556 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1557 self->y += MAP_EXTEND_Y;
1549 } 1558 }
1550} 1559}
1551 1560
1552void 1561SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1562map1a_update (CFPlus::Map self, SV *data_, int extmap)
1554 CODE: 1563 CODE:
1555{ 1564{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1566 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1567 mapcell *cell;
1559 int x, y, flags; 1568 int x, y, z, flags;
1569 AV *missing = newAV ();
1570 RETVAL = newRV_noinc ((SV *)missing);
1560 1571
1561 while (data < data_end - 1) 1572 while (data < data_end - 1)
1562 { 1573 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1574 flags = (data [0] << 8) + data [1]; data += 2;
1564 1575
… …
1615 } 1626 }
1616 else 1627 else
1617 cell->darkness = *data++ + 1; 1628 cell->darkness = *data++ + 1;
1618 } 1629 }
1619 1630
1631 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1632 if (flags & (4 >> z))
1621 { 1633 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1634 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1635 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 1636 cell->tile [z] = self->face2tile [face];
1637
1638 if (cell->tile [z])
1639 {
1640 maptex *tex = self->tex + cell->tile [z];
1641 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z]));
1643
1644 if (tex->smoothtile)
1645 {
1646 maptex *smooth = self->tex + tex->smoothtile;
1647 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile));
1649 }
1650 }
1625 } 1651 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1652 }
1641 else 1653 else
1642 cell->darkness = 0; 1654 cell->darkness = 0;
1643 } 1655 }
1644} 1656}
1657 OUTPUT:
1658 RETVAL
1645 1659
1646SV * 1660SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1648 CODE: 1662 CODE:
1649{ 1663{
… …
1700 1714
1701void 1715void
1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1703 CODE: 1717 CODE:
1704{ 1718{
1719 int x, y, z;
1720
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1708 smooth_key skey; 1724 smooth_key skey;
1709 int x, y, z; 1725
1710 int last_name; 1726 rc_t *rc = rc_alloc ();
1727 rc_key_t key;
1728 rc_array_t *arr;
1711 1729
1712 // thats current max. sorry. 1730 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1731 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1732 if (sh > 255) sh = 255;
1715 1733
1716 // clear key, in case of extra padding 1734 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1735 memset (&skey, 0, sizeof (skey));
1718 1736
1719 glColor4ub (255, 255, 255, 255); 1737 memset (&key, 0, sizeof (key));
1720 1738 key.r = 255;
1721 glEnable (GL_BLEND); 1739 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1740 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1741 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1742 key.mode = GL_QUADS;
1725 1743 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 1744 key.texname = -1;
1727
1728 last_name = 0;
1729 1745
1730 mx += self->x; 1746 mx += self->x;
1731 my += self->y; 1747 my += self->y;
1732 1748
1733 // first pass: determine smooth_max 1749 // first pass: determine smooth_max
… …
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 1765 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 1766 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 1767 self->tex [cell->tile [2]].smoothlevel));
1752 } 1768 }
1753 } 1769 }
1770
1771 glEnable (GL_BLEND);
1772 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754 1774
1755 for (z = 0; z <= 2; z++) 1775 for (z = 0; z <= 2; z++)
1756 { 1776 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 1777 memset (smooth_level, 0, sizeof (smooth_level));
1758 1778
… …
1768 tileid tile = cell->tile [z]; 1788 tileid tile = cell->tile [z];
1769 1789
1770 if (tile) 1790 if (tile)
1771 { 1791 {
1772 maptex tex = self->tex [tile]; 1792 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1793 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1794
1776 // suppressing texture state switches here 1795 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort 1796 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1797 if (key.texname != tex.name)
1779 { 1798 {
1780 if (!tex.name) 1799 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 1800 tex = self->tex [2]; /* missing, replace by noface */
1782 1801
1783 glEnd (); 1802 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1803 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 1804 }
1787 1805
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1806 px = (x + 1) * T - tex.w;
1807 py = (y + 1) * T - tex.h;
1808
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792 1813
1793 if (cell->flags && z == 2) 1814 if (cell->flags && z == 2)
1794 { 1815 {
1816 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 1817 if (cell->flags & 1)
1796 { 1818 {
1797 maptex tex = self->tex [1]; 1819 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 1820 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 1821 int py = y * T - T * 6 / 32;
1800 1822
1823 if (tex.name)
1801 glEnd (); 1824 {
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803 glBegin (GL_QUADS); 1835 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 1836 }
1810 } 1837 }
1811 1838
1812 // update smooth hash 1839 // update smooth hash
1813 if (tex.smoothtile) 1840 if (tex.smoothtile)
… …
1848 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 1875 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1849 } 1876 }
1850 } 1877 }
1851 } 1878 }
1852 } 1879 }
1880
1881 rc_draw (rc);
1882 rc_clear (rc);
1853 1883
1854 // go through all smoothlevels, lowest to highest, then draw. 1884 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 1885 // this is basically counting sort
1856 { 1886 {
1857 int w, b; 1887 int w, b;
… …
1882 int border = bits & 15; 1912 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1913 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 1914 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 1915 float dy = tex.t * .5f ; // 2 images/column
1886 1916
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 1917 if (tex.name)
1890 { 1918 {
1919 // this time avoiding texture state changes
1920 // save gobs of state changes.
1891 if (!tex.name) 1921 if (key.texname != tex.name)
1892 continue; // smoothing not yet available
1893
1894 glEnd (); 1922 {
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1923 key.texname = tex.name;
1896 glBegin (GL_QUADS); 1924 arr = rc_array (rc, &key);
1897 } 1925 }
1898 1926
1899 if (border) 1927 if (border)
1900 { 1928 {
1901 float ox = border * dx; 1929 float ox = border * dx;
1902 1930
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0);
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);
1907 } 1935 }
1908 1936
1909 if (corner) 1937 if (corner)
1910 { 1938 {
1911 float ox = corner * dx; 1939 float ox = corner * dx;
1912 1940
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 1941 rc_t2f_v3f (arr, ox , dy , px , py , 0);
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);
1945 }
1917 } 1946 }
1918 } 1947 }
1919 } 1948 }
1920 } 1949 }
1921 } 1950 }
1922 } 1951 }
1923 1952
1924 hv_clear (smooth); 1953 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1925 } 1956 }
1926 1957
1927 glEnd ();
1928
1929 glDisable (GL_TEXTURE_2D);
1930 glDisable (GL_BLEND); 1958 glDisable (GL_BLEND);
1959 rc_free (rc);
1931 1960
1932 // top layer: overlays such as the health bar 1961 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 1962 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 1963 if (0 <= y + my && y + my < self->rows)
1935 { 1964 {
… …
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2364 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2365
2337void 2366void
2338set_position (CFPlus::Channel self, int angle, int distance) 2367set_position (CFPlus::Channel self, int angle, int distance)
2339 CODE: 2368 CODE:
2369
2370void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2372 CODE:
2373{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377}
2341 2378
2342void 2379void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2380set_reverse_stereo (CFPlus::Channel self, int flip)
2344 CODE: 2381 CODE:
2345 Mix_SetReverseStereo (self, flip); 2382 Mix_SetReverseStereo (self, flip);

Diff Legend

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