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

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.110 by root, Sat Jun 10 02:22:33 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.110 by root, Sat Jun 10 02:22:33 2006 UTC