[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC

…		…
48	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
50		50
51	#define MIN_FONT_HEIGHT 10	51	#define MIN_FONT_HEIGHT 10
52		52
53	#define GL_CALL(type,func,args) \	53	static struct
54	{ \	54	{
55	static int init_; \	55	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	56	#include "glfunc.h"
57	\	57	#undef GL_FUNC
58	if (!init_) \	58	} gl;
59	{ \	59
60	init_ = 1; \	60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	61	{
62	} \	62	if (gl.BlendFuncSeparate)
63	\	63	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	64	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	66	else
		67	glBlendFunc (sa, da);
		68	}
67		69
68	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
70		72
71	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		86
85	static void	87	static void
86	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
87	{	89	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING, 1);
		91	FcPatternAddBool (pattern, FC_HINTSTYLE, FC_HINT_FULL);
89	#ifdef _WIN32	92	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	94	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	96	#endif
…		…
416	}	419	}
417		420
418	void	421	void
419	pango_init ()	422	pango_init ()
420	CODE:	423	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	424	// delayed, so it can pick up new fonts added by AddFontResourceEx
		425	{
		426	{
423	ft2_fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	428	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		430	}
		431	{
		432	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	433	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	434	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		435	#ifdef _WIN32
		436	// cairo looks like shit eaten twice on windows
		437	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		438	#else
		439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		440	#endif
		441	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		442	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		443	pango_cairo_context_set_font_options (cairo_context, fopt);
		444	cairo_font_options_destroy (fopt);
		445	}
429	}	446	}
430		447
431	int	448	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		450
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	497	CODE:
481	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	500	);
		501	if (RETVAL)
		502	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	503	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		504	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		505	# include "glfunc.h"
		506	# undef GL_FUNC
		507	}
485	OUTPUT:	508	OUTPUT:
486	RETVAL	509	RETVAL
487		510
488	void	511	void
489	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
		513
		514	char *
		515	SDL_GetKeyName (int sym)
490		516
491	void	517	void
492	SDL_PollEvent ()	518	SDL_PollEvent ()
493	PPCODE:	519	PPCODE:
494	{	520	{
495	SDL_Event ev;	521	SDL_Event ev;
496	int i;
497	static int modifier;
498	static int modkey[] = {
499	SDLK_RSHIFT, KMOD_RSHIFT,
500	SDLK_LSHIFT, KMOD_LSHIFT,
501	SDLK_RCTRL, KMOD_RCTRL,
502	SDLK_LCTRL, KMOD_LCTRL,
503	SDLK_RALT, KMOD_RALT,
504	SDLK_LALT, KMOD_LALT,
505	SDLK_RMETA, KMOD_RMETA,
506	SDLK_LMETA, KMOD_LMETA,
507	};
508		522
509	while (SDL_PollEvent (&ev))	523	while (SDL_PollEvent (&ev))
510	{	524	{
511	HV *hv = newHV ();	525	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	526	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		527
514	switch (ev.type)	528	switch (ev.type)
515	{	529	{
516	case SDL_KEYDOWN:	530	case SDL_KEYDOWN:
517	case SDL_KEYUP:	531	case SDL_KEYUP:
518
519	for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520	if (modkey [i * 2] == ev.key.keysym.sym)
521	{
522	if (ev.type == SDL_KEYDOWN)
523	modifier \|= modkey [i * 2 + 1];
524	else
525	modifier &= ~modkey [i * 2 + 1];
526	break;
527	}
528
529	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	533	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	534	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	535	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	536	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	539	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	540	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	541	break;
539		542
540	case SDL_MOUSEMOTION:	543	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	544	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		545
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	546	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	547	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	548	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	549	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	550	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	551	break;
549		552
550	case SDL_MOUSEBUTTONDOWN:	553	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	554	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	555	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		556
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	557	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	558	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	559	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	560	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
584	lowdelay (int fd, int val = 1)	587	lowdelay (int fd, int val = 1)
585	CODE:	588	CODE:
586	#ifndef _WIN32	589	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	591	#endif
589
590	char *
591	gl_vendor ()
592	CODE:
593	RETVAL = (char *)glGetString (GL_VENDOR);
594	OUTPUT:
595	RETVAL
596
597	char *
598	gl_version ()
599	CODE:
600	RETVAL = (char *)glGetString (GL_VERSION);
601	OUTPUT:
602	RETVAL
603
604	char *
605	gl_extensions ()
606	CODE:
607	RETVAL = (char *)glGetString (GL_EXTENSIONS);
608	OUTPUT:
609	RETVAL
610		592
611	void	593	void
612	add_font (char *file)	594	add_font (char *file)
613	CODE:	595	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	596	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
750	MODULE = CFClient PACKAGE = CFClient::Layout	732	MODULE = CFClient PACKAGE = CFClient::Layout
751		733
752	CFClient::Layout	734	CFClient::Layout
753	new (SV *class, int rgba = 0)	735	new (SV *class, int rgba = 0)
754	CODE:	736	CODE:
755	#if _WIN32
756	rgba = 0;//D
757	#endif
758	New (0, RETVAL, 1, struct cf_layout);	737	New (0, RETVAL, 1, struct cf_layout);
759		738
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	739	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
761	RETVAL->rgba = rgba;	740	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	741	RETVAL->r = 1.;
…		…
806		785
807	SV *	786	SV *
808	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
809	CODE:	788	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
812	OUTPUT:	791	OUTPUT:
813	RETVAL	792	RETVAL
814		793
815	void	794	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	795	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
1008	{	987	{
1009	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		992
1015	if (items < 5)	993	if (items < 5)
1016	{	994	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	997	}
1020		998
1021	if (ix)	999	if (ix)
1022	{	1000	{
1023	glEnable (GL_BLEND);	1001	glEnable (GL_BLEND);
		1002
		1003	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1004	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	else
		1006	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1007	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1008
1025	glEnable (GL_ALPHA_TEST);	1009	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1010	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1011	}
1028		1012
1029	glBindTexture (GL_TEXTURE_2D, name);	1013	glBindTexture (GL_TEXTURE_2D, name);
1030
1031	if (wrap_mode)
1032	{
1033	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035	}
1036		1014
1037	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1117	tex->r = r;	1095	tex->r = r;
1118	tex->g = g;	1096	tex->g = g;
1119	tex->b = b;	1097	tex->b = b;
1120	tex->a = a;	1098	tex->a = a;
1121	}	1099	}
		1100
		1101	// somewhat hackish, but for textures that require it, it really
		1102	// improves the look, and most others don't suffer.
		1103	glBindTexture (GL_TEXTURE_2D, name);
		1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1105	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1106	// use uglier nearest interpolation because linear suffers
		1107	// from transparent color bleeding and ugly wrapping effects.
		1108	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122	}	1109	}
1123		1110
1124	int	1111	int
1125	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
1126	ALIAS:	1113	ALIAS:
1127	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
1128	CODE:	1119	CODE:
1129	switch (ix)	1120	switch (ix)
1130	{	1121	{
1131	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
1132	case 1: RETVAL = self->oy; break;	1123	case 1: RETVAL = self->oy; break;
		1124	case 2: RETVAL = self->x; break;
		1125	case 3: RETVAL = self->y; break;
		1126	case 4: RETVAL = self->w; break;
		1127	case 5: RETVAL = self->h; break;
1133	}	1128	}
1134	OUTPUT:	1129	OUTPUT:
1135	RETVAL	1130	RETVAL
1136		1131
1137	void	1132	void
…		…
1574	const_iv (GL_RESCALE_NORMAL),	1569	const_iv (GL_RESCALE_NORMAL),
1575	const_iv (GL_AND),	1570	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1571	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1572	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1574	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1583	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1584	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1581	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1582	const_iv (GL_UNSIGNED_INT),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1638		1635
1639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1638	}
1642		1639
		1640	char *
		1641	gl_vendor ()
		1642	CODE:
		1643	RETVAL = (char *)glGetString (GL_VENDOR);
		1644	OUTPUT:
		1645	RETVAL
		1646
		1647	char *
		1648	gl_version ()
		1649	CODE:
		1650	RETVAL = (char *)glGetString (GL_VERSION);
		1651	OUTPUT:
		1652	RETVAL
		1653
		1654	char *
		1655	gl_extensions ()
		1656	CODE:
		1657	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1658	OUTPUT:
		1659	RETVAL
		1660
1643	int glGetError ()	1661	int glGetError ()
1644		1662
1645	void glClear (int mask)	1663	void glClear (int mask)
1646		1664
1647	void glClearColor (float r, float g, float b, float a = 1.0)	1665	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1654	void glShadeModel (int mode)	1672	void glShadeModel (int mode)
1655		1673
1656	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1657		1675
1658	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
		1677
		1678	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1679	CODE:
		1680	gl_BlendFuncSeparate (sa, da, saa, daa);
1659		1681
1660	void glDepthMask (int flag)	1682	void glDepthMask (int flag)
1661		1683
1662	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1663		1685
…		…
1697		1719
1698	void glEnd ()	1720	void glEnd ()
1699		1721
1700	void glColor (float r, float g, float b, float a = 1.0)	1722	void glColor (float r, float g, float b, float a = 1.0)
1701	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1702	CODE:	1726	CODE:
		1727	if (ix)
		1728	{
		1729	r *= a;
		1730	g *= a;
		1731	b *= a;
		1732	}
1703	// microsoft visual "c" rounds instead of truncating...	1733	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	1734	glColor4ub (MIN ((int)(r * 256.f), 255),
1705	MIN ((int)(g * 255.f), 255),	1735	MIN ((int)(g * 256.f), 255),
1706	MIN ((int)(b * 255.f), 255),	1736	MIN ((int)(b * 256.f), 255),
1707	MIN ((int)(a * 255.f), 255));	1737	MIN ((int)(a * 256.f), 255));
1708		1738
1709	void glInterleavedArrays (int format, int stride, char *data)	1739	void glInterleavedArrays (int format, int stride, char *data)
1710		1740
1711	void glDrawElements (int mode, int count, int type, char *indices)	1741	void glDrawElements (int mode, int count, int type, char *indices)
1712		1742
…		…
1735		1765
1736	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1737		1767
1738	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	1769	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1770	if (gl.ConvolutionParameterf)
		1771	gl.ConvolutionParameterf (target, pname, params);
1741		1772
1742	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1773	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743	CODE:	1774	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1775	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		1777
1747	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1778	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1748	CODE:	1779	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1780	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		1782
1752	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1783	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753		1784
1754	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1785	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755		1786

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs. Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.108 by root, Wed Jun 7 23:28:12 2006 UTC