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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 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;
…		…
441	SDL_Rect **m;	443	SDL_Rect **m;
442		444
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);	448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		449
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450		452
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
470		472
471	++m;	473	++m;
472	}	474	}
473	}	475	}
474		476
		477	char *
		478	SDL_GetError ()
		479
475	int	480	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	481	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	482	CODE:
478	RETVAL = !!SDL_SetVideoMode (	483	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	484	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	485	);
		486	if (RETVAL)
		487	{
481	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	488	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		489	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		490	# include "glfunc.h"
		491	# undef GL_FUNC
		492	}
482	OUTPUT:	493	OUTPUT:
483	RETVAL	494	RETVAL
484		495
485	void	496	void
486	SDL_GL_SwapBuffers ()	497	SDL_GL_SwapBuffers ()
		498
		499	char *
		500	SDL_GetKeyName (int sym)
487		501
488	void	502	void
489	SDL_PollEvent ()	503	SDL_PollEvent ()
490	PPCODE:	504	PPCODE:
491	{	505	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	524	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	526	break;
513		527
514	case SDL_MOUSEMOTION:	528	case SDL_MOUSEMOTION:
		529	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		530
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	531	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	532	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	533	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	534	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	535	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	536	break;
521		537
522	case SDL_MOUSEBUTTONDOWN:	538	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	539	case SDL_MOUSEBUTTONUP:
		540	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		541
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	542	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	544	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	545	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	546	break;
…		…
554	lowdelay (int fd, int val = 1)	572	lowdelay (int fd, int val = 1)
555	CODE:	573	CODE:
556	#ifndef _WIN32	574	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	576	#endif
559
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		577
574	void	578	void
575	add_font (char *file)	579	add_font (char *file)
576	CODE:	580	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
714		718
715	CFClient::Layout	719	CFClient::Layout
716	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
717	CODE:	721	CODE:
718	#if _WIN32	722	#if _WIN32
719	rgba = 0;//D	723	//rgba = 0;//D makes text nicer, breaks TextView
720	#endif	724	#endif
		725	rgba=1;//D
721	New (0, RETVAL, 1, struct cf_layout);	726	New (0, RETVAL, 1, struct cf_layout);
722		727
723	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
724	RETVAL->rgba = rgba;	729	RETVAL->rgba = rgba;
725	RETVAL->r = 1.;	730	RETVAL->r = 1.;
…		…
971	{	976	{
972	HV hv = (HV )SvRV (self);	977	HV hv = (HV )SvRV (self);
973	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	978	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	979	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	980	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977		981
978	if (items < 5)	982	if (items < 5)
979	{	983	{
980	w = SvNV (*hv_fetch (hv, "w", 1, 1));	984	w = SvNV (*hv_fetch (hv, "w", 1, 1));
981	h = SvNV (*hv_fetch (hv, "h", 1, 1));	985	h = SvNV (*hv_fetch (hv, "h", 1, 1));
982	}	986	}
983		987
984	if (ix)	988	if (ix)
985	{	989	{
986	glEnable (GL_BLEND);	990	glEnable (GL_BLEND);
		991
		992	if (ix == 2)
987	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	993	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		994	else
		995	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		996	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		997
988	glEnable (GL_ALPHA_TEST);	998	glEnable (GL_ALPHA_TEST);
989	glAlphaFunc (GL_GREATER, 0.01f);	999	glAlphaFunc (GL_GREATER, 0.01f);
990	}	1000	}
991		1001
992	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
993
994	if (wrap_mode)
995	{
996	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998	}
999		1003
1000	glBegin (GL_QUADS);	1004	glBegin (GL_QUADS);
1001	glTexCoord2f (0, 0); glVertex2f (x , y );	1005	glTexCoord2f (0, 0); glVertex2f (x , y );
1002	glTexCoord2f (0, t); glVertex2f (x , y + h);	1006	glTexCoord2f (0, t); glVertex2f (x , y + h);
1003	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1007	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1080	tex->r = r;	1084	tex->r = r;
1081	tex->g = g;	1085	tex->g = g;
1082	tex->b = b;	1086	tex->b = b;
1083	tex->a = a;	1087	tex->a = a;
1084	}	1088	}
		1089
		1090	// somewhat hackish, but for textures that require it, it really
		1091	// improves the look, and most others don't suffer.
		1092	glBindTexture (GL_TEXTURE_2D, name);
		1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1094	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1095	// use uglier nearest interpolation because linear suffers
		1096	// from transparent color bleeding and ugly wrapping effects.
		1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1085	}	1098	}
1086		1099
1087	int	1100	int
1088	ox (CFClient::Map self)	1101	ox (CFClient::Map self)
1089	ALIAS:	1102	ALIAS:
1090	oy = 1	1103	oy = 1
		1104	x = 2
		1105	y = 3
		1106	w = 4
		1107	h = 5
1091	CODE:	1108	CODE:
1092	switch (ix)	1109	switch (ix)
1093	{	1110	{
1094	case 0: RETVAL = self->ox; break;	1111	case 0: RETVAL = self->ox; break;
1095	case 1: RETVAL = self->oy; break;	1112	case 1: RETVAL = self->oy; break;
		1113	case 2: RETVAL = self->x; break;
		1114	case 3: RETVAL = self->y; break;
		1115	case 4: RETVAL = self->w; break;
		1116	case 5: RETVAL = self->h; break;
1096	}	1117	}
1097	OUTPUT:	1118	OUTPUT:
1098	RETVAL	1119	RETVAL
1099		1120
1100	void	1121	void
…		…
1527	const_iv (GL_COLOR_MATERIAL),	1548	const_iv (GL_COLOR_MATERIAL),
1528	const_iv (GL_SMOOTH),	1549	const_iv (GL_SMOOTH),
1529	const_iv (GL_FLAT),	1550	const_iv (GL_FLAT),
1530	const_iv (GL_DITHER),	1551	const_iv (GL_DITHER),
1531	const_iv (GL_BLEND),	1552	const_iv (GL_BLEND),
		1553	const_iv (GL_CULL_FACE),
1532	const_iv (GL_SCISSOR_TEST),	1554	const_iv (GL_SCISSOR_TEST),
		1555	const_iv (GL_DEPTH_TEST),
		1556	const_iv (GL_ALPHA_TEST),
		1557	const_iv (GL_NORMALIZE),
		1558	const_iv (GL_RESCALE_NORMAL),
1533	const_iv (GL_AND),	1559	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1560	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1561	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1562	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1563	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1565	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1566	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1567	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1568	const_iv (GL_RGBA),
1542	const_iv (GL_UNSIGNED_BYTE),	1569	const_iv (GL_UNSIGNED_BYTE),
		1570	const_iv (GL_UNSIGNED_SHORT),
		1571	const_iv (GL_UNSIGNED_INT),
1543	const_iv (GL_ALPHA),	1572	const_iv (GL_ALPHA),
1544	const_iv (GL_INTENSITY),	1573	const_iv (GL_INTENSITY),
1545	const_iv (GL_LUMINANCE),	1574	const_iv (GL_LUMINANCE),
1546	const_iv (GL_LUMINANCE_ALPHA),	1575	const_iv (GL_LUMINANCE_ALPHA),
1547	const_iv (GL_FLOAT),	1576	const_iv (GL_FLOAT),
…		…
1553	const_iv (GL_TEXTURE_MAG_FILTER),	1582	const_iv (GL_TEXTURE_MAG_FILTER),
1554	const_iv (GL_TEXTURE_MIN_FILTER),	1583	const_iv (GL_TEXTURE_MIN_FILTER),
1555	const_iv (GL_TEXTURE_ENV_MODE),	1584	const_iv (GL_TEXTURE_ENV_MODE),
1556	const_iv (GL_TEXTURE_WRAP_S),	1585	const_iv (GL_TEXTURE_WRAP_S),
1557	const_iv (GL_TEXTURE_WRAP_T),	1586	const_iv (GL_TEXTURE_WRAP_T),
		1587	const_iv (GL_REPEAT),
1558	const_iv (GL_CLAMP),	1588	const_iv (GL_CLAMP),
1559	const_iv (GL_REPEAT),	1589	const_iv (GL_CLAMP_TO_EDGE),
1560	const_iv (GL_NEAREST),	1590	const_iv (GL_NEAREST),
1561	const_iv (GL_LINEAR),	1591	const_iv (GL_LINEAR),
1562	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1595	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566	const_iv (GL_GENERATE_MIPMAP),	1596	const_iv (GL_GENERATE_MIPMAP),
1567	const_iv (GL_MODULATE),	1597	const_iv (GL_MODULATE),
1568	const_iv (GL_DECAL),	1598	const_iv (GL_DECAL),
1569	const_iv (GL_REPLACE),	1599	const_iv (GL_REPLACE),
		1600	const_iv (GL_DEPTH_BUFFER_BIT),
1570	const_iv (GL_COLOR_BUFFER_BIT),	1601	const_iv (GL_COLOR_BUFFER_BIT),
1571	const_iv (GL_PROJECTION),	1602	const_iv (GL_PROJECTION),
1572	const_iv (GL_MODELVIEW),	1603	const_iv (GL_MODELVIEW),
1573	const_iv (GL_COLOR_LOGIC_OP),	1604	const_iv (GL_COLOR_LOGIC_OP),
1574	const_iv (GL_SEPARABLE_2D),	1605	const_iv (GL_SEPARABLE_2D),
1575	const_iv (GL_CONVOLUTION_2D),	1606	const_iv (GL_CONVOLUTION_2D),
1576	const_iv (GL_CONVOLUTION_BORDER_MODE),	1607	const_iv (GL_CONVOLUTION_BORDER_MODE),
1577	const_iv (GL_CONSTANT_BORDER),	1608	const_iv (GL_CONSTANT_BORDER),
1578	const_iv (GL_LINES),	1609	const_iv (GL_LINES),
		1610	const_iv (GL_LINE_LOOP),
1579	const_iv (GL_QUADS),	1611	const_iv (GL_QUADS),
1580	const_iv (GL_LINE_LOOP),	1612	const_iv (GL_QUAD_STRIP),
		1613	const_iv (GL_TRIANGLES),
		1614	const_iv (GL_TRIANGLE_STRIP),
		1615	const_iv (GL_TRIANGLE_FAN),
1581	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1616	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582	const_iv (GL_FASTEST),	1617	const_iv (GL_FASTEST),
		1618	const_iv (GL_V2F),
		1619	const_iv (GL_V3F),
		1620	const_iv (GL_T2F_V3F),
		1621	const_iv (GL_T2F_N3F_V3F),
1583	# undef const_iv	1622	# undef const_iv
1584	};	1623	};
1585		1624
1586	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1587	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588	}	1627	}
1589		1628
		1629	char *
		1630	gl_vendor ()
		1631	CODE:
		1632	RETVAL = (char *)glGetString (GL_VENDOR);
		1633	OUTPUT:
		1634	RETVAL
		1635
		1636	char *
		1637	gl_version ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VERSION);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_extensions ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1647	OUTPUT:
		1648	RETVAL
		1649
1590	int glGetError ()	1650	int glGetError ()
1591		1651
1592	void glClear (int mask)	1652	void glClear (int mask)
1593		1653
1594	void glClearColor (float r, float g, float b, float a = 1.0)	1654	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1602		1662
1603	void glHint (int target, int mode)	1663	void glHint (int target, int mode)
1604		1664
1605	void glBlendFunc (int sfactor, int dfactor)	1665	void glBlendFunc (int sfactor, int dfactor)
1606		1666
		1667	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1668	CODE:
		1669	gl_BlendFuncSeparate (sa, da, saa, daa);
		1670
		1671	void glDepthMask (int flag)
		1672
1607	void glLogicOp (int opcode)	1673	void glLogicOp (int opcode)
1608		1674
1609	void glColorMask (int red, int green, int blue, int alpha)	1675	void glColorMask (int red, int green, int blue, int alpha)
1610		1676
1611	void glMatrixMode (int mode)	1677	void glMatrixMode (int mode)
…		…
1614		1680
1615	void glPopMatrix ()	1681	void glPopMatrix ()
1616		1682
1617	void glLoadIdentity ()	1683	void glLoadIdentity ()
1618		1684
1619	# near and far are due to microsofts buggy c compiler	1685	# near_ and far_ are due to microsofts buggy "c" compiler
		1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1687
		1688	# near_ and far_ are due to microsofts buggy "c" compiler
1620	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1689	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1621		1690
1622	void glViewport (int x, int y, int width, int height)	1691	void glViewport (int x, int y, int width, int height)
1623		1692
1624	void glScissor (int x, int y, int width, int height)	1693	void glScissor (int x, int y, int width, int height)
…		…
1639		1708
1640	void glEnd ()	1709	void glEnd ()
1641		1710
1642	void glColor (float r, float g, float b, float a = 1.0)	1711	void glColor (float r, float g, float b, float a = 1.0)
1643	PROTOTYPE: @	1712	PROTOTYPE: @
		1713	ALIAS:
		1714	glColor_premultiply = 1
1644	CODE:	1715	CODE:
		1716	if (ix)
		1717	{
		1718	r *= a;
		1719	g *= a;
		1720	b *= a;
		1721	}
		1722	// microsoft visual "c" rounds instead of truncating...
1645	glColor4ub (MIN ((int)(r * 255.f), 255),	1723	glColor4ub (MIN ((int)(r * 256.f), 255),
1646	MIN ((int)(g * 255.f), 255),	1724	MIN ((int)(g * 256.f), 255),
1647	MIN ((int)(b * 255.f), 255),	1725	MIN ((int)(b * 256.f), 255),
1648	MIN ((int)(a * 255.f), 255));	1726	MIN ((int)(a * 256.f), 255));
		1727
		1728	void glInterleavedArrays (int format, int stride, char *data)
		1729
		1730	void glDrawElements (int mode, int count, int type, char *indices)
		1731
		1732	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1733
		1734	void glRasterPos (float x, float y, float z = 0.)
		1735	CODE:
		1736	glRasterPos3f (0, 0, z);
		1737	glBitmap (0, 0, 0, 0, x, y, 0);
1649		1738
1650	void glVertex (float x, float y, float z = 0.)	1739	void glVertex (float x, float y, float z = 0.)
1651	CODE:	1740	CODE:
1652	glVertex3f (x, y, z);	1741	glVertex3f (x, y, z);
1653		1742
…		…
1665		1754
1666	void glBindTexture (int target, int name)	1755	void glBindTexture (int target, int name)
1667		1756
1668	void glConvolutionParameter (int target, int pname, float params)	1757	void glConvolutionParameter (int target, int pname, float params)
1669	CODE:	1758	CODE:
1670	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1759	if (gl.ConvolutionParameterf)
		1760	gl.ConvolutionParameterf (target, pname, params);
1671		1761
1672	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1762	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1673	CODE:	1763	CODE:
1674	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1764	if (gl.ConvolutionFilter2D)
1675	(target, internalformat, width, height, format, type, data));	1765	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1676		1766
1677	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1767	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1678	CODE:	1768	CODE:
1679	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1769	if (gl.SeparableFilter2D)
1680	(target, internalformat, width, height, format, type, row, column));	1770	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1681		1771
1682	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1772	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1683		1773
1684	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1774	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685		1775
1686	void glRasterPos (int x, int y)	1776	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687	CODE:
1688	glRasterPos2i (x, y);
1689		1777
1690	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1778	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1691		1779
1692	int glGenTexture ()	1780	int glGenTexture ()
1693	CODE:	1781	CODE:
…		…
1720		1808
1721	void glEndList ()	1809	void glEndList ()
1722		1810
1723	void glCallList (int list)	1811	void glCallList (int list)
1724		1812
		1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC