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.214 by root, Sun Jul 29 18:56:02 2007 UTC vs.
Revision 1.222 by root, Sat Aug 11 06:34:26 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>
… …
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
805 } 810 }
806} 811}
807 812
808int 813int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
810 POSTCALL: 815 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 816 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 817 Mix_ChannelFinished (channel_finished);
813 818
814void 819void
… …
1350 HV *hv = (HV *)SvRV (self); 1355 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1356 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1357 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1358 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1359
1360 if (name <= 0)
1361 XSRETURN_EMPTY;
1362
1355 if (items < 5) 1363 if (items < 5)
1356 { 1364 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1365 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1366 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1367 }
… …
1547 self->rows += MAP_EXTEND_Y; 1555 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1556 self->y += MAP_EXTEND_Y;
1549 } 1557 }
1550} 1558}
1551 1559
1552void 1560SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1561map1a_update (CFPlus::Map self, SV *data_, int extmap)
1554 CODE: 1562 CODE:
1555{ 1563{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1565 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1566 mapcell *cell;
1559 int x, y, flags; 1567 int x, y, z, flags;
1568 AV *missing = newAV ();
1569 RETVAL = newRV_noinc ((SV *)missing);
1560 1570
1561 while (data < data_end - 1) 1571 while (data < data_end - 1)
1562 { 1572 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1573 flags = (data [0] << 8) + data [1]; data += 2;
1564 1574
… …
1615 } 1625 }
1616 else 1626 else
1617 cell->darkness = *data++ + 1; 1627 cell->darkness = *data++ + 1;
1618 } 1628 }
1619 1629
1630 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1631 if (flags & (4 >> z))
1621 { 1632 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1634 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 1635 cell->tile [z] = self->face2tile [face];
1636
1637 if (cell->tile [z])
1638 {
1639 maptex *tex = self->tex + cell->tile [z];
1640 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z]));
1642
1643 if (tex->smoothtile)
1644 {
1645 maptex *smooth = self->tex + tex->smoothtile;
1646 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile));
1648 }
1649 }
1625 } 1650 }
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 } 1651 }
1641 else 1652 else
1642 cell->darkness = 0; 1653 cell->darkness = 0;
1643 } 1654 }
1644} 1655}
1656 OUTPUT:
1657 RETVAL
1645 1658
1646SV * 1659SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1648 CODE: 1661 CODE:
1649{ 1662{
… …
1723 glEnable (GL_TEXTURE_2D); 1736 glEnable (GL_TEXTURE_2D);
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1725 1738
1726 glBegin (GL_QUADS); 1739 glBegin (GL_QUADS);
1727 1740
1728 last_name = 0; 1741 last_name = -1;
1729 1742
1730 mx += self->x; 1743 mx += self->x;
1731 my += self->y; 1744 my += self->y;
1732 1745
1733 // first pass: determine smooth_max 1746 // first pass: determine smooth_max
… …
1768 tileid tile = cell->tile [z]; 1781 tileid tile = cell->tile [z];
1769 1782
1770 if (tile) 1783 if (tile)
1771 { 1784 {
1772 maptex tex = self->tex [tile]; 1785 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1786 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1787
1776 // suppressing texture state switches here 1788 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort 1789 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1790 if (last_name != tex.name)
1779 { 1791 {
… …
1782 1794
1783 glEnd (); 1795 glEnd ();
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1785 glBegin (GL_QUADS); 1797 glBegin (GL_QUADS);
1786 } 1798 }
1799
1800 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h;
1787 1802
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
… …
2260 CODE: 2275 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2276 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2277 OUTPUT:
2263 RETVAL 2278 RETVAL
2264 2279
2280# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '('
2265void 2282#void
2266close (CFPlus::RW self) 2283#close (CFPlus::RW self)
2267 CODE: 2284# CODE:
2268 SDL_RWclose (self); 2285# (self->(close)) (self);
2269 2286
2270MODULE = CFPlus PACKAGE = CFPlus::Channel 2287MODULE = CFPlus PACKAGE = CFPlus::Channel
2271 2288
2272PROTOTYPES: DISABLE 2289PROTOTYPES: DISABLE
2290
2291CFPlus::Channel
2292find ()
2293 CODE:
2294{
2295 RETVAL = Mix_GroupAvailable (-1);
2296
2297 if (RETVAL < 0)
2298 {
2299 RETVAL = Mix_GroupOldest (-1);
2300
2301 if (RETVAL < 0)
2302 XSRETURN_UNDEF;
2303
2304 Mix_HaltChannel (RETVAL);
2305 }
2306
2307 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128);
2309}
2310 OUTPUT:
2311 RETVAL
2273 2312
2274void 2313void
2275halt (CFPlus::Channel self) 2314halt (CFPlus::Channel self)
2276 CODE: 2315 CODE:
2277 Mix_HaltChannel (self); 2316 Mix_HaltChannel (self);
… …
2287 Mix_FadeOutChannel (self, ticks); 2326 Mix_FadeOutChannel (self, ticks);
2288 2327
2289int 2328int
2290volume (CFPlus::Channel self, int volume) 2329volume (CFPlus::Channel self, int volume)
2291 CODE: 2330 CODE:
2292 RETVAL = Mix_Volume (self, volume); 2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2293 OUTPUT: 2332 OUTPUT:
2294 RETVAL 2333 RETVAL
2295 2334
2296void 2335void
2297unregister_all_effects (CFPlus::Channel self) 2336unregister_all_effects (CFPlus::Channel self)
… …
2299 Mix_UnregisterAllEffects (self); 2338 Mix_UnregisterAllEffects (self);
2300 2339
2301void 2340void
2302set_panning (CFPlus::Channel self, int left, int right) 2341set_panning (CFPlus::Channel self, int left, int right)
2303 CODE: 2342 CODE:
2343 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255);
2304 Mix_SetPanning (self, left, right); 2345 Mix_SetPanning (self, left, right);
2305 2346
2306void 2347void
2307set_distance (CFPlus::Channel self, int distance) 2348set_distance (CFPlus::Channel self, int distance)
2308 CODE: 2349 CODE:
2309 Mix_SetDistance (self, distance); 2350 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2310 2351
2311void 2352void
2312set_position (CFPlus::Channel self, int angle, int distance) 2353set_position (CFPlus::Channel self, int angle, int distance)
2313 CODE: 2354 CODE:
2355
2356void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2358 CODE:
2359{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2314 Mix_SetPosition (self, angle, distance); 2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363}
2315 2364
2316void 2365void
2317set_reverse_stereo (CFPlus::Channel self, int flip) 2366set_reverse_stereo (CFPlus::Channel self, int flip)
2318 CODE: 2367 CODE:
2319 Mix_SetReverseStereo (self, flip); 2368 Mix_SetReverseStereo (self, flip);
… …
2335 Mix_FreeChunk (self); 2384 Mix_FreeChunk (self);
2336 2385
2337int 2386int
2338volume (CFPlus::MixChunk self, int volume = -1) 2387volume (CFPlus::MixChunk self, int volume = -1)
2339 CODE: 2388 CODE:
2389 if (items > 1)
2390 volume = CLAMP (volume, 0, 128);
2340 RETVAL = Mix_VolumeChunk (self, volume); 2391 RETVAL = Mix_VolumeChunk (self, volume);
2341 OUTPUT: 2392 OUTPUT:
2342 RETVAL 2393 RETVAL
2343 2394
2344CFPlus::Channel 2395CFPlus::Channel
2345play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2346 CODE: 2397 CODE:
2398{
2347 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400
2401 if (RETVAL < 0)
2402 XSRETURN_UNDEF;
2403
2404 if (channel < 0)
2405 {
2348 Mix_UnregisterAllEffects (RETVAL); 2406 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128);
2408 }
2409}
2349 OUTPUT: 2410 OUTPUT:
2350 RETVAL 2411 RETVAL
2351 2412
2352MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2353 2414
2354int 2415int
2355volume (int volume = -1) 2416volume (int volume = -1)
2356 PROTOTYPE: ;$ 2417 PROTOTYPE: ;$
2357 CODE: 2418 CODE:
2419 if (items > 0)
2420 volume = CLAMP (volume, 0, 128);
2358 RETVAL = Mix_VolumeMusic (volume); 2421 RETVAL = Mix_VolumeMusic (volume);
2359 OUTPUT: 2422 OUTPUT:
2360 RETVAL 2423 RETVAL
2361 2424
2362void 2425void

Diff Legend

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