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.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
52#include <glib/gmacros.h> 53#include <glib.h>
53 54
54#include <pango/pango.h> 55#include <pango/pango.h>
55 56
56#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
97 123
98static AV *texture_av; 124static AV *texture_av;
99 125
100static struct 126static struct
101{ 127{
158{ 184{
159 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
160 186
161 while (attrs) 187 while (attrs)
162 { 188 {
163 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 190
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 192 return 1;
167 193
168 attrs = attrs->next; 194 attrs = attrs->next;
186static void 212static void
187substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
188{ 214{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 218#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 220}
195 221
196static void 222static void
233 int w, h; 259 int w, h;
234 float s, t; 260 float s, t;
235 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
236 tileid smoothtile; 262 tileid smoothtile;
237 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
238} maptex; 265} maptex;
239 266
240typedef struct { 267typedef struct {
241 uint32_t player; 268 uint32_t player;
242 tileid tile[3]; 269 tileid tile[3];
455 482
456 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
457} 484}
458 485
459static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
460minpot (unsigned int n) 493minpot (unsigned int n)
461{ 494{
462 if (!n) 495 if (!n)
463 return 0; 496 return 0;
464 497
544 577
545 return mod; 578 return mod;
546} 579}
547 580
548static void 581static void
549deliantra_main () 582deliantra_main (SV *real_main)
550{ 583{
551 char *argv[] = { 0 }; 584 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
553} 588}
554 589
555#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
556 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
561 */ 598 */
562 extern C_LINKAGE int 599 extern C_LINKAGE int
563 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
564 { 601 {
565 deliantra_main (); 602 deliantra_main (real_main);
566 } 603 }
567 604
568 #undef main 605 #undef main
569 606
570 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
571 608
572 static void 609 static void
573 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
574 { 611 {
612 real_main = real_main_;
613
575 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 615 (main) (1, argv);
577 } 616 }
578#else 617#else
579 static void 618 static void
580 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
581 { 620 {
582 deliantra_main (); 621 deliantra_main (real_main);
583 } 622 }
584#endif 623#endif
585 624
586MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
587 626
788 827
789 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
790# undef const_iv 829# undef const_iv
791 }; 830 };
792 831
793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 834
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 837}
799 838
815NV ceil (NV x) 854NV ceil (NV x)
816 855
817IV minpot (UV n) 856IV minpot (UV n)
818 857
819IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
820 865
821void 866void
822pango_init () 867pango_init ()
823 CODE: 868 CODE:
824{ 869{
832#endif 877#endif
833} 878}
834 879
835char *SDL_GetError () 880char *SDL_GetError ()
836 881
837void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
838 884
839int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
840 886
841int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
842 888
843void SDL_QuitSubSystem (U32 flags) 889void SDL_QuitSubSystem (U32 flags)
844 890
845void SDL_Quit () 891void SDL_Quit ()
846 892
847int SDL_GL_SetAttribute (int attr, int value) 893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
848 895
849int SDL_GL_GetAttribute (int attr) 896int SDL_GL_GetAttribute (int attr)
850 CODE: 897 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 899 XSRETURN_UNDEF;
853 OUTPUT: 900 OUTPUT:
854 RETVAL 901 RETVAL
855 902
856void 903void
911 ); 958 );
912 959
913 if (RETVAL) 960 if (RETVAL)
914 { 961 {
915 av_clear (texture_av); 962 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
919#include "glfunc.h" 964#include "glfunc.h"
920#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 968 }
922} 969}
923 OUTPUT: 970 OUTPUT:
924 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
925 975
926void 976void
927SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
928 978
929char * 979char *
930SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
931 982
932int 983int
933SDL_GetAppState () 984SDL_GetAppState ()
934 985
935int 986int
936SDL_GetModState () 987SDL_GetModState ()
937 988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
938void 993void
994SDL_PumpEvents ()
995
996void
939poll_events () 997peep_events ()
940 PPCODE: 998 PPCODE:
941{ 999{
942 SDL_Event ev; 1000 SDL_Event ev;
943 1001
944 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
1010 1068
1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012 } 1070 }
1013} 1071}
1014 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
1015int 1086int
1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017 POSTCALL: 1088 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1081add_font (char *file) 1152add_font (char *file)
1082 CODE: 1153 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1155 OUTPUT:
1085 RETVAL 1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1086 1164
1087void 1165void
1088load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
1089 ALIAS: 1167 ALIAS:
1090 load_image_file = 1 1168 load_image_file = 1
1136 1214
1137 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
1146 1224
1206#if DEBUG 1284#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
1208#endif 1286#endif
1209} 1287}
1210 1288
1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1297
1213PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1214 1299
1215DC::Font 1300DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1302 CODE:
1218{ 1303{
1219 int count; 1304 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1335 PROTOTYPE:
1251 CODE: 1336 CODE:
1252 tc_restore (); 1337 tc_restore ();
1253 1338
1254DC::Layout 1339DC::Layout
1255new (SV *class) 1340new (SV *klass)
1256 CODE: 1341 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1258 1343
1259 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1409 1494
1410void 1495void
1411set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1412 CODE: 1497 CODE:
1413 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1414 { 1499 {
1415 self->base_height = base_height; 1500 self->base_height = base_height;
1416 layout_update_font (self); 1501 layout_update_font (self);
1417 } 1502 }
1418 1503
1419void 1504void
1646 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1648 } 1733 }
1649} 1734}
1650 1735
1736void
1737draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1858 CODE:
1653{ 1859{
1654 GLint width; 1860 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1869
1664PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1665 1871
1666DC::Map 1872DC::Map
1667new (SV *class) 1873new (SV *klass)
1668 CODE: 1874 CODE:
1669 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1670 RETVAL->x = 0; 1876 RETVAL->x = 0;
1671 RETVAL->y = 0; 1877 RETVAL->y = 0;
1672 RETVAL->w = 0; 1878 RETVAL->w = 0;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1965 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1969}
1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1764 1990
1765int 1991int
1766ox (DC::Map self) 1992ox (DC::Map self)
1767 ALIAS: 1993 ALIAS:
1768 oy = 1 1994 oy = 1
1808 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1809 } 2035 }
1810} 2036}
1811 2037
1812SV * 2038SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1814 CODE: 2040 CODE:
1815{ 2041{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2044 mapcell *cell;
1839 2065
1840 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1841 2067
1842 if (flags & 8) 2068 if (flags & 8)
1843 { 2069 {
2070 uint8_t ext, cmd;
2071
1844 if (extmap) 2072 do
1845 { 2073 {
1846 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1847 2076
1848 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1849 { 2080 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2081 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2083 }
1878 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1879 } 2101 }
1880 else 2102 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2103 }
1883 2104
1884 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1886 { 2107 {
1889 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1890 2111
1891 if (cell->tile [z]) 2112 if (cell->tile [z])
1892 { 2113 {
1893 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1894 if (!tex->name) 2116 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1896 2118
1897 if (tex->smoothtile) 2119 if (tex->smoothtile)
1898 { 2120 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1900 if (!smooth->name) 2123 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1902 } 2125 }
1903 } 2126 }
1904 } 2127 }
1932 ? self->row + y 2155 ? self->row + y
1933 : 0; 2156 : 0;
1934 2157
1935 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1936 { 2159 {
1937 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2161
1939 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1940 { 2163 {
1941 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1942 2165
1944 { 2167 {
1945 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2170 int a1 = tex.a;
1948 2171
1949 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1953 } 2176 }
1954 } 2177 }
1955 2178
1956 *map++ = (r ) 2179 *map++ = (r )
1957 | (g << 8) 2180 | (g << 8)
1964} 2187}
1965 OUTPUT: 2188 OUTPUT:
1966 RETVAL 2189 RETVAL
1967 2190
1968void 2191void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970 CODE: 2193 CODE:
1971{ 2194{
1972 int x, y, z; 2195 int x, y, z;
1973 2196
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977 smooth_key skey; 2200 smooth_key skey;
1978 int pl_x, pl_y; 2201 int pl_x, pl_y;
1979 maptex pl_tex; 2202 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2205 rc_key_t key;
1982 rc_array_t *arr; 2206 rc_array_t *arr;
1983 2207
1984 pl_tex.name = 0; 2208 pl_tex.name = 0;
1985 2209
1986 // thats current max. sorry. 2210 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1989 2213
1990 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1995 key.g = 255; 2219 key.g = 255;
1996 key.b = 255; 2220 key.b = 255;
1997 key.a = 255; 2221 key.a = 255;
1998 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2224
2002 mx += self->x; 2225 mx += self->x;
2003 my += self->y; 2226 my += self->y;
2004 2227
2005 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2253
2031 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
2032 { 2255 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
2034 2258
2035 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2037 { 2261 {
2038 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2268 tileid tile = cell->tile [z];
2045 2269
2046 if (tile) 2270 if (tile)
2047 { 2271 {
2048 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2273 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2274
2052 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
2053 { 2276 {
2277 self->tex [tile].unused = 0;
2278
2054 if (!tex.name) 2279 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2281
2057 key.texname = tex.name; 2282 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
2059 } 2284 }
2285
2286 px = (x + 1) * Th - tex.w;
2287 py = (y + 1) * Tw - tex.h;
2060 2288
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2290 {
2063 pl_x = px; 2291 pl_x = px;
2064 pl_y = py; 2292 pl_y = py;
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073 2301
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098
2099 // update smooth hash 2302 // update smooth hash
2100 if (tex.smoothtile) 2303 if (tex.smoothtile)
2101 { 2304 {
2102 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2306 skey.level = tex.smoothlevel;
2131 // corners 2334 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2339 }
2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136 } 2360 }
2137 } 2361 }
2138 } 2362 }
2139 } 2363 }
2140 2364
2167 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
2168 && skey->level == level 2392 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
2170 { 2394 {
2171 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
2172 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
2173 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
2174 int border = bits & 15; 2398 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
2178 2402
2180 { 2404 {
2181 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
2182 // save gobs of state changes. 2406 // save gobs of state changes.
2183 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
2184 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
2185 glEnd (); 2411 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
2188 } 2414 }
2189 2415
2190 if (border) 2416 if (border)
2191 { 2417 {
2192 float ox = border * dx; 2418 float ox = border * dx;
2193 2419
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2424 }
2199 2425
2200 if (corner) 2426 if (corner)
2201 { 2427 {
2202 float ox = corner * dx; 2428 float ox = corner * dx;
2203 2429
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 } 2434 }
2209 } 2435 }
2210 } 2436 }
2211 } 2437 }
2212 } 2438 }
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236 2462
2237 rc_draw (rc); 2463 rc_draw (rc);
2238 } 2464 }
2239 2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
2240 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2241 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
2242 2472
2243 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
2246 { 2476 {
2249 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2481 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2253 2483
2254 int px = x * T; 2484 int px = x * Tw;
2255 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
2256 2492
2257 if (cell->stat_hp) 2493 if (cell->stat_hp)
2258 { 2494 {
2259 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2497
2262 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2500 px + width - 1, py);
2265 2501
2271 } 2507 }
2272 } 2508 }
2273} 2509}
2274 2510
2275void 2511void
2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2277 CODE: 2513 CODE:
2278{ 2514{
2279 static float color[16][3] = { 2515 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2284 2520
2285 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2289 2525
2290 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2294 2530
2295 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2296 2532
2297 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2300 }; 2536 };
2301 2537
2302 int x, y; 2538 int x, y;
2303 2539
2304 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2309 2551
2310 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2314 2556
2315 if (m) 2557 if (m)
2316 { 2558 {
2317 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2318 2560
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2321 2563
2322 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2569 }
2335void 2577void
2336fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2337 PPCODE: 2579 PPCODE:
2338{ 2580{
2339 int x, y; 2581 int x, y;
2340 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2343 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2590
2348 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2593
2351 mx += self->x - 1; 2594 mx += self->x - 1;
2352 my += self->y - 1; 2595 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2596
2356 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2358 { 2599 {
2359 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2604 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2365 2606
2366 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2610 }
2370 } 2611 }
2371 2612
2372 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2392 2633
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2637
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2647 }
2407 2648
2408 free (darkness1); 2649 free (darkness1);
2409 2650
2410 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2414} 2655}
2415 2656
2416SV * 2657SV *
2503 STRLEN len; 2744 STRLEN len;
2504 uint8_t *data, *end; 2745 uint8_t *data, *end;
2505 2746
2506 len = SvLEN (data_sv); 2747 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv); 2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2509 end = data + len + 8; 2750 end = data + len + 8;
2510 2751
2511 if (len < 5) 2752 if (len < 5)
2512 XSRETURN_EMPTY; 2753 XSRETURN_EMPTY;
2513 2754
2574} 2815}
2575 2816
2576MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2577 2818
2578DC::RW 2819DC::RW
2579new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2580 CODE: 2821 CODE:
2581{ 2822{
2582 STRLEN datalen; 2823 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2584 2825
2586} 2827}
2587 OUTPUT: 2828 OUTPUT:
2588 RETVAL 2829 RETVAL
2589 2830
2590DC::RW 2831DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2592 CODE: 2833 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT: 2835 OUTPUT:
2595 RETVAL 2836 RETVAL
2596 2837
2614 if (RETVAL < 0) 2855 if (RETVAL < 0)
2615 { 2856 {
2616 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2617 2858
2618 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2619 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2620 2866 }
2867 else
2621 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2622 } 2869 }
2623 2870
2624 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2626} 2873}
2673void 2920void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2922 CODE:
2676{ 2923{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2927}
2681 2928
2682void 2929void
2683set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2686 2933
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2935
2689PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2690 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2691DC::MixChunk 2950DC::MixChunk
2692new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2693 CODE: 2952 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT: 2954 OUTPUT:
2696 RETVAL 2955 RETVAL
2697 2956
2727 OUTPUT: 2986 OUTPUT:
2728 RETVAL 2987 RETVAL
2729 2988
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
3002
2732int 3003int
2733volume (int volume = -1) 3004volume (int volume = -1)
2734 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2735 CODE: 3006 CODE:
2736 if (items > 0) 3007 if (items > 0)
2747void 3018void
2748halt () 3019halt ()
2749 CODE: 3020 CODE:
2750 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2751 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2752DC::MixMusic 3030DC::MixMusic
2753new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2754 CODE: 3032 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2756 OUTPUT: 3034 OUTPUT:
2757 RETVAL 3035 RETVAL
2758 3036
2786 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2888 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889# undef const_iv 3175# undef const_iv
2890 }; 3176 };
2891 3177
2892 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3180
2895 texture_av = newAV (); 3181 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2897} 3183}
2898 3184
2900disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2901 CODE: 3187 CODE:
2902 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2904 3190
2905char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2906gl_vendor () 3195gl_vendor ()
2907 CODE: 3196 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2909 OUTPUT: 3198 OUTPUT:
2910 RETVAL 3199 RETVAL
2911 3200
2912char * 3201const char *
2913gl_version () 3202gl_version ()
2914 CODE: 3203 CODE:
2915 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2916 OUTPUT: 3205 OUTPUT:
2917 RETVAL 3206 RETVAL
2918 3207
2919char * 3208const char *
2920gl_extensions () 3209gl_extensions ()
2921 CODE: 3210 CODE:
2922 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2923 OUTPUT: 3212 OUTPUT:
2924 RETVAL 3213 RETVAL
2925 3214
2926const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2927 3220
2928GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2929 CODE: 3222 CODE:
2930 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT: 3224 OUTPUT:
2939 3232
2940int glGetError () 3233int glGetError ()
2941 3234
2942void glFinish () 3235void glFinish ()
2943 3236
3237void glFlush ()
3238
2944void glClear (int mask) 3239void glClear (int mask)
2945 3240
2946void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3242 PROTOTYPE: @
2948 3243
2957void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2958 3253
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3255 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2962 3259
2963void glDepthMask (int flag) 3260void glDepthMask (int flag)
2964 3261
2965void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2966 3263
3001void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
3002 CODE: 3299 CODE:
3003 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
3004 3301
3005void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
3006 ALIAS: 3304 ALIAS:
3007 glColor_premultiply = 1 3305 glColor_premultiply = 1
3008 CODE: 3306 CODE:
3009 if (ix) 3307 if (ix)
3010 { 3308 {
3115void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
3116 3414
3117void glEndList () 3415void glEndList ()
3118 3416
3119void glCallList (int list) 3417void glCallList (int list)
3418
3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3120 3423
3121MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3122 3425
3123PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
3124 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines