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.217 by root, Wed Aug 1 12:43:31 2007 UTC vs.
Revision 1.240 by root, Wed Dec 26 18:09:30 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
… …
144typedef struct cf_layout { 150typedef struct cf_layout {
145 PangoLayout *pl; 151 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
147 int base_height; 153 int base_height;
148 CFPlus__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
149} *CFPlus__Layout; 156} *CFPlus__Layout;
150 157
151static CFPlus__Font default_font; 158static CFPlus__Font default_font;
152static PangoContext *opengl_context; 159static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
… …
196 203
197typedef uint16_t tileid; 204typedef uint16_t tileid;
198typedef uint16_t faceid; 205typedef uint16_t faceid;
199 206
200typedef struct { 207typedef struct {
201 int name; 208 GLuint name;
202 int w, h; 209 int w, h;
203 float s, t; 210 float s, t;
204 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
205 tileid smoothtile; 212 tileid smoothtile;
206 uint8_t smoothlevel; 213 uint8_t smoothlevel;
… …
431 n |= n >> 4; 438 n |= n >> 4;
432 n |= n >> 8; 439 n |= n >> 8;
433 n |= n >> 16; 440 n |= n >> 16;
434 441
435 return n + 1; 442 return n + 1;
443}
444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
436} 454}
437 455
438/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
… …
518 536
519 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
522 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
… …
599 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 626# undef const_iv
605 }; 627 };
606 628
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
625 RETVAL 647 RETVAL
626 648
627NV floor (NV x) 649NV floor (NV x)
628 650
629NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
630 656
631void 657void
632pango_init () 658pango_init ()
633 CODE: 659 CODE:
634{ 660{
… …
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 701
676 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
677 while (*m) 703 while (*m)
678 { 704 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 600)
680 { 706 {
681 AV *av = newAV (); 707 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
… …
708 734
709 if (RETVAL) 735 if (RETVAL)
710 { 736 {
711 av_clear (texture_av); 737 av_clear (texture_av);
712 738
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 741#include "glfunc.h"
716#undef GL_FUNC 742#undef GL_FUNC
717 } 743 }
718} 744}
… …
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
805 } 831 }
806} 832}
807 833
808int 834int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 836 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
839
840void
841Mix_QuerySpec ()
842 PPCODE:
843{
844 int freq, channels;
845 Uint16 format;
846
847 if (Mix_QuerySpec (&freq, &format, &channels))
848 {
849 EXTEND (SP, 3);
850 PUSHs (sv_2mortal (newSViv (freq)));
851 PUSHs (sv_2mortal (newSViv (format)));
852 PUSHs (sv_2mortal (newSViv (channels)));
853 }
854}
813 855
814void 856void
815Mix_CloseAudio () 857Mix_CloseAudio ()
816 858
817int 859int
… …
951void 993void
952error (char *message) 994error (char *message)
953 CODE: 995 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 997#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 999#endif
958 1000
959void 1001void
960fatal (char *message) 1002fatal (char *message)
961 CODE: 1003 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1005#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1007#endif
966 _exit (1); 1008 _exit (1);
967 1009
968void 1010void
969_exit (int retval = 0) 1011_exit (int retval = 0)
… …
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = CFPlus PACKAGE = CFPlus::Layout
1014 1056
1015PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1016 1058
1017void 1059void
1018reset_glyph_cache () 1060glyph_cache_backup ()
1019 PROTOTYPE: 1061 PROTOTYPE:
1020 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1021 tc_clear (); 1069 tc_restore ();
1022 1070
1023CFPlus::Layout 1071CFPlus::Layout
1024new (SV *class) 1072new (SV *class)
1025 CODE: 1073 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
… …
1030 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1035 1084
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1038 OUTPUT: 1087 OUTPUT:
1039 RETVAL 1088 RETVAL
1040 1089
1041void 1090void
1042DESTROY (CFPlus::Layout self) 1091DESTROY (CFPlus::Layout self)
1043 CODE: 1092 CODE:
1044 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1045 Safefree (self); 1095 Safefree (self);
1046 1096
1047void 1097void
1048set_text (CFPlus::Layout self, SV *text_) 1098set_text (CFPlus::Layout self, SV *text_)
1049 CODE: 1099 CODE:
… …
1301 } 1351 }
1302} 1352}
1303 1353
1304void 1354void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1355render (CFPlus::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1356 CODE:
1357 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1358 pango_opengl_render_layout_subpixel (
1308 self->pl, 1359 self->pl,
1360 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1361 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1362 self->r, self->g, self->b, self->a,
1311 flags 1363 flags
1312 ); 1364 );
1365 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl);
1368
1369void
1370draw (CFPlus::Layout self)
1371 CODE:
1372{
1373 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND);
1376 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1377 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1378 glEnable (GL_ALPHA_TEST);
1379 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1380
1381 rc_draw (self->rc);
1382
1383 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D);
1386}
1313 1387
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1388MODULE = CFPlus PACKAGE = CFPlus::Texture
1315 1389
1316PROTOTYPES: ENABLE 1390PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1391
1320void 1392void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1393pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1394 CODE:
1323{ 1395{
… …
1349{ 1421{
1350 HV *hv = (HV *)SvRV (self); 1422 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1423 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1424 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1425 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1426
1427 if (name <= 0)
1428 XSRETURN_EMPTY;
1354 1429
1355 if (items < 5) 1430 if (items < 5)
1356 { 1431 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1432 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1433 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1547 self->rows += MAP_EXTEND_Y; 1622 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1623 self->y += MAP_EXTEND_Y;
1549 } 1624 }
1550} 1625}
1551 1626
1552void 1627SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1628map1a_update (CFPlus::Map self, SV *data_, int extmap)
1554 CODE: 1629 CODE:
1555{ 1630{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1632 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1633 mapcell *cell;
1559 int x, y, flags; 1634 int x, y, z, flags;
1635 AV *missing = newAV ();
1636 RETVAL = newRV_noinc ((SV *)missing);
1560 1637
1561 while (data < data_end - 1) 1638 while (data < data_end - 1)
1562 { 1639 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1640 flags = (data [0] << 8) + data [1]; data += 2;
1564 1641
… …
1615 } 1692 }
1616 else 1693 else
1617 cell->darkness = *data++ + 1; 1694 cell->darkness = *data++ + 1;
1618 } 1695 }
1619 1696
1697 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1698 if (flags & (4 >> z))
1621 { 1699 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1700 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1701 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 1702 cell->tile [z] = self->face2tile [face];
1703
1704 if (cell->tile [z])
1705 {
1706 maptex *tex = self->tex + cell->tile [z];
1707 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z]));
1709
1710 if (tex->smoothtile)
1711 {
1712 maptex *smooth = self->tex + tex->smoothtile;
1713 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile));
1715 }
1716 }
1625 } 1717 }
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 } 1718 }
1641 else 1719 else
1642 cell->darkness = 0; 1720 cell->darkness = 0;
1643 } 1721 }
1644} 1722}
1723 OUTPUT:
1724 RETVAL
1645 1725
1646SV * 1726SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1648 CODE: 1728 CODE:
1649{ 1729{
… …
1700 1780
1701void 1781void
1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1703 CODE: 1783 CODE:
1704{ 1784{
1785 int x, y, z;
1786
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1788 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) 1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708 smooth_key skey; 1790 smooth_key skey;
1709 int x, y, z; 1791
1710 int last_name; 1792 rc_t *rc = rc_alloc ();
1793 rc_key_t key;
1794 rc_array_t *arr;
1711 1795
1712 // thats current max. sorry. 1796 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1797 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1798 if (sh > 255) sh = 255;
1715 1799
1716 // clear key, in case of extra padding 1800 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1801 memset (&skey, 0, sizeof (skey));
1718 1802
1719 glColor4ub (255, 255, 255, 255); 1803 memset (&key, 0, sizeof (key));
1720 1804 key.r = 255;
1721 glEnable (GL_BLEND); 1805 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1806 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1807 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1808 key.mode = GL_QUADS;
1725 1809 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 1810 key.texname = -1;
1727
1728 last_name = 0;
1729 1811
1730 mx += self->x; 1812 mx += self->x;
1731 my += self->y; 1813 my += self->y;
1732 1814
1733 // first pass: determine smooth_max 1815 // first pass: determine smooth_max
… …
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 1831 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 1832 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 1833 self->tex [cell->tile [2]].smoothlevel));
1752 } 1834 }
1753 } 1835 }
1836
1837 glEnable (GL_BLEND);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754 1840
1755 for (z = 0; z <= 2; z++) 1841 for (z = 0; z <= 2; z++)
1756 { 1842 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 1843 memset (smooth_level, 0, sizeof (smooth_level));
1758 1844
… …
1768 tileid tile = cell->tile [z]; 1854 tileid tile = cell->tile [z];
1769 1855
1770 if (tile) 1856 if (tile)
1771 { 1857 {
1772 maptex tex = self->tex [tile]; 1858 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1859 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1860
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1861 if (key.texname != tex.name)
1779 { 1862 {
1780 if (!tex.name) 1863 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 1864 tex = self->tex [2]; /* missing, replace by noface */
1782 1865
1783 glEnd (); 1866 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1867 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 1868 }
1787 1869
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1870 px = (x + 1) * T - tex.w;
1871 py = (y + 1) * T - tex.h;
1872
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1874 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); 1875 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 ); 1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792 1877
1793 if (cell->flags && z == 2) 1878 if (cell->flags && z == 2)
1794 { 1879 {
1880 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 1881 if (cell->flags & 1)
1796 { 1882 {
1797 maptex tex = self->tex [1]; 1883 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 1884 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 1885 int py = y * T - T * 6 / 32;
1800 1886
1887 if (tex.name)
1801 glEnd (); 1888 {
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803 glBegin (GL_QUADS); 1899 }
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 } 1900 }
1810 } 1901 }
1811 1902
1812 // update smooth hash 1903 // update smooth hash
1813 if (tex.smoothtile) 1904 if (tex.smoothtile)
… …
1849 } 1940 }
1850 } 1941 }
1851 } 1942 }
1852 } 1943 }
1853 1944
1945 rc_draw (rc);
1946 rc_clear (rc);
1947
1854 // go through all smoothlevels, lowest to highest, then draw. 1948 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 1949 // this is basically counting sort
1856 { 1950 {
1857 int w, b; 1951 int w, b;
1858 1952
1953 glEnable (GL_TEXTURE_2D);
1954 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 1955 for (w = 0; w < 256 / 32; ++w)
1860 { 1956 {
1861 uint32_t smask = smooth_level [w]; 1957 uint32_t smask = smooth_level [w];
1862 if (smask) 1958 if (smask)
1863 for (b = 0; b < 32; ++b) 1959 for (b = 0; b < 32; ++b)
… …
1882 int border = bits & 15; 1978 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1979 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 1980 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 1981 float dy = tex.t * .5f ; // 2 images/column
1886 1982
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 1983 if (tex.name)
1890 { 1984 {
1985 // this time avoiding texture state changes
1986 // save gobs of state changes.
1891 if (!tex.name) 1987 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 1988 {
1893
1894 glEnd (); 1989 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 1991 glBegin (GL_QUADS);
1897 } 1992 }
1898 1993
1899 if (border) 1994 if (border)
1900 { 1995 {
1901 float ox = border * dx; 1996 float ox = border * dx;
1902 1997
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 2002 }
1908 2003
1909 if (corner) 2004 if (corner)
1910 { 2005 {
1911 float ox = corner * dx; 2006 float ox = corner * dx;
1912 2007
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2008 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2012 }
1917 } 2013 }
1918 } 2014 }
1919 } 2015 }
1920 } 2016 }
1921 } 2017 }
2018
2019 glEnd ();
2020 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1;
1922 } 2022 }
1923 2023
1924 hv_clear (smooth); 2024 hv_clear (smooth);
1925 } 2025 }
1926 2026
1927 glEnd ();
1928
1929 glDisable (GL_TEXTURE_2D);
1930 glDisable (GL_BLEND); 2027 glDisable (GL_BLEND);
2028 rc_free (rc);
1931 2029
1932 // top layer: overlays such as the health bar 2030 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2031 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2032 if (0 <= y + my && y + my < self->rows)
1935 { 2033 {
… …
2184 int x, y, z; 2282 int x, y, z;
2185 int w, h; 2283 int w, h;
2186 int x1, y1; 2284 int x1, y1;
2187 2285
2188 if (*data++ != 0) 2286 if (*data++ != 0)
2189 return; /* version mismatch */ 2287 XSRETURN_EMPTY; /* version mismatch */
2190 2288
2191 w = *data++ << 8; w |= *data++; 2289 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2290 h = *data++ << 8; h |= *data++;
2193 2291
2194 // we need to do this 'cause we don't keep an absolute coord system for rows 2292 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2260 CODE: 2358 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2359 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2360 OUTPUT:
2263 RETVAL 2361 RETVAL
2264 2362
2363# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '('
2265void 2365#void
2266close (CFPlus::RW self) 2366#close (CFPlus::RW self)
2267 CODE: 2367# CODE:
2268 SDL_RWclose (self); 2368# (self->(close)) (self);
2269 2369
2270MODULE = CFPlus PACKAGE = CFPlus::Channel 2370MODULE = CFPlus PACKAGE = CFPlus::Channel
2271 2371
2272PROTOTYPES: DISABLE 2372PROTOTYPES: DISABLE
2273 2373
… …
2333 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2433 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2334 2434
2335void 2435void
2336set_position (CFPlus::Channel self, int angle, int distance) 2436set_position (CFPlus::Channel self, int angle, int distance)
2337 CODE: 2437 CODE:
2438
2439void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2441 CODE:
2442{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2338 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446}
2339 2447
2340void 2448void
2341set_reverse_stereo (CFPlus::Channel self, int flip) 2449set_reverse_stereo (CFPlus::Channel self, int flip)
2342 CODE: 2450 CODE:
2343 Mix_SetReverseStereo (self, flip); 2451 Mix_SetReverseStereo (self, flip);
… …
2480 const_iv (GL_INTENSITY), 2588 const_iv (GL_INTENSITY),
2481 const_iv (GL_LUMINANCE), 2589 const_iv (GL_LUMINANCE),
2482 const_iv (GL_LUMINANCE_ALPHA), 2590 const_iv (GL_LUMINANCE_ALPHA),
2483 const_iv (GL_FLOAT), 2591 const_iv (GL_FLOAT),
2484 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2593 const_iv (GL_COMPRESSED_ALPHA_ARB),
2594 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2595 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2596 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2597 const_iv (GL_COMPRESSED_RGB_ARB),
2598 const_iv (GL_COMPRESSED_RGBA_ARB),
2485 const_iv (GL_COMPILE), 2599 const_iv (GL_COMPILE),
2486 const_iv (GL_PROXY_TEXTURE_1D), 2600 const_iv (GL_PROXY_TEXTURE_1D),
2487 const_iv (GL_PROXY_TEXTURE_2D), 2601 const_iv (GL_PROXY_TEXTURE_2D),
2488 const_iv (GL_TEXTURE_1D), 2602 const_iv (GL_TEXTURE_1D),
2489 const_iv (GL_TEXTURE_2D), 2603 const_iv (GL_TEXTURE_2D),
… …
2528 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2642 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2529 const_iv (GL_POINT_SMOOTH_HINT), 2643 const_iv (GL_POINT_SMOOTH_HINT),
2530 const_iv (GL_LINE_SMOOTH_HINT), 2644 const_iv (GL_LINE_SMOOTH_HINT),
2531 const_iv (GL_POLYGON_SMOOTH_HINT), 2645 const_iv (GL_POLYGON_SMOOTH_HINT),
2532 const_iv (GL_GENERATE_MIPMAP_HINT), 2646 const_iv (GL_GENERATE_MIPMAP_HINT),
2647 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2533 const_iv (GL_FASTEST), 2648 const_iv (GL_FASTEST),
2534 const_iv (GL_DONT_CARE), 2649 const_iv (GL_DONT_CARE),
2535 const_iv (GL_NICEST), 2650 const_iv (GL_NICEST),
2536 const_iv (GL_V2F), 2651 const_iv (GL_V2F),
2537 const_iv (GL_V3F), 2652 const_iv (GL_V3F),
… …
2545 2660
2546 texture_av = newAV (); 2661 texture_av = newAV ();
2547 AvREAL_off (texture_av); 2662 AvREAL_off (texture_av);
2548} 2663}
2549 2664
2665void
2666disable_GL_EXT_blend_func_separate ()
2667 CODE:
2668 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0;
2670
2550char * 2671char *
2551gl_vendor () 2672gl_vendor ()
2552 CODE: 2673 CODE:
2553 RETVAL = (char *)glGetString (GL_VENDOR); 2674 RETVAL = (char *)glGetString (GL_VENDOR);
2554 OUTPUT: 2675 OUTPUT:
… …
2675 2796
2676void glRect (float x1, float y1, float x2, float y2) 2797void glRect (float x1, float y1, float x2, float y2)
2677 CODE: 2798 CODE:
2678 glRectf (x1, y1, x2, y2); 2799 glRectf (x1, y1, x2, y2);
2679 2800
2801void glRect_lineloop (float x1, float y1, float x2, float y2)
2802 CODE:
2803 glBegin (GL_LINE_LOOP);
2804 glVertex2f (x1, y1);
2805 glVertex2f (x2, y1);
2806 glVertex2f (x2, y2);
2807 glVertex2f (x1, y2);
2808 glEnd ();
2809
2680PROTOTYPES: ENABLE 2810PROTOTYPES: ENABLE
2681 2811
2682void glBegin (int mode) 2812void glBegin (int mode)
2683 2813
2684void glEnd () 2814void glEnd ()
… …
2785 NV x, y, w, h; 2915 NV x, y, w, h;
2786 SV *draw_x_sv = GvSV (draw_x_gv); 2916 SV *draw_x_sv = GvSV (draw_x_gv);
2787 SV *draw_y_sv = GvSV (draw_y_gv); 2917 SV *draw_y_sv = GvSV (draw_y_gv);
2788 SV *draw_w_sv = GvSV (draw_w_gv); 2918 SV *draw_w_sv = GvSV (draw_w_gv);
2789 SV *draw_h_sv = GvSV (draw_h_gv); 2919 SV *draw_h_sv = GvSV (draw_h_gv);
2790 SV *hover;
2791 double draw_x, draw_y, draw_w, draw_h; 2920 double draw_x, draw_y;
2792 2921
2793 if (!SvROK (self)) 2922 if (!SvROK (self))
2794 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2795 2924
2796 hv = (HV *)SvRV (self); 2925 hv = (HV *)SvRV (self);
… …
2824 { 2953 {
2825 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2954 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2826 2955
2827 if (svp && SvTRUE (*svp)) 2956 if (svp && SvTRUE (*svp))
2828 { 2957 {
2829 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2958 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2830 glEnable (GL_BLEND); 2959 glEnable (GL_BLEND);
2831 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2960 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2832 glBegin (GL_QUADS); 2961 glBegin (GL_QUADS);
2833 glVertex2f (0, 0); 2962 glVertex2f (0, 0);
2834 glVertex2f (w, 0); 2963 glVertex2f (w, 0);
… …
2837 glEnd (); 2966 glEnd ();
2838 glDisable (GL_BLEND); 2967 glDisable (GL_BLEND);
2839 } 2968 }
2840 } 2969 }
2841#if 0 2970#if 0
2842 if ($ENV{CFPLUS_DEBUG} & 1) { 2971 // draw borders, for debugging
2843 glPushMatrix; 2972 glPushMatrix ();
2844 glColor 1, 1, 0, 1; 2973 glColor4f (1., 1., 0., 1.);
2845 glTranslate 0.375, 0.375; 2974 glTranslatef (.5, .5, 0.);
2846 glBegin GL_LINE_LOOP; 2975 glBegin (GL_LINE_LOOP);
2847 glVertex 0 , 0; 2976 glVertex2f (0 , 0);
2848 glVertex $self->{w} - 1, 0; 2977 glVertex2f (w - 1, 0);
2849 glVertex $self->{w} - 1, $self->{h} - 1; 2978 glVertex2f (w - 1, h - 1);
2850 glVertex 0 , $self->{h} - 1; 2979 glVertex2f (0 , h - 1);
2851 glEnd; 2980 glEnd ();
2852 glPopMatrix; 2981 glPopMatrix ();
2853 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2854 }
2855#endif 2982#endif
2856 PUSHMARK (SP); 2983 PUSHMARK (SP);
2857 XPUSHs (self); 2984 XPUSHs (self);
2858 PUTBACK; 2985 PUTBACK;
2859 call_method ("_draw", G_VOID | G_DISCARD); 2986 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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