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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.44 by root, Mon Apr 17 07:30:20 2006 UTC vs.
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC

…		…
		1	#ifdef _WIN32
		2	# include <malloc.h>
		3	#endif
		4
1	#include "EXTERN.h"	5	#include "EXTERN.h"
2	#include "perl.h"	6	#include "perl.h"
3	#include "XSUB.h"	7	#include "XSUB.h"
4		8
5	#include <string.h>	9	#include <string.h>
6	#include <stdio.h>	10	#include <stdio.h>
7		11
8	#include <SDL.h>	12	#include <SDL.h>
9	#include <SDL_image.h>	13	#include <SDL_image.h>
		14	#include <SDL_mixer.h>
10	#include <SDL_opengl.h>	15	#include <SDL_opengl.h>
11		16
12	#include <glib/gmacros.h>	17	#include <glib/gmacros.h>
13		18
14	#include <pango/pango.h>	19	#include <pango/pango.h>
15	#include <pango/pangofc-fontmap.h>	20	#include <pango/pangofc-fontmap.h>
16	#include <pango/pangoft2.h>	21	#include <pango/pangoft2.h>
17		22
		23	#ifndef _WIN32
18	#include <sys/types.h>	24	# include <sys/types.h>
19	#include <sys/socket.h>	25	# include <sys/socket.h>
20	#include <netinet/in.h>	26	# include <netinet/in.h>
21	#include <netinet/tcp.h>	27	# include <netinet/tcp.h>
22
23	#include <inttypes.h>	28	# include <inttypes.h>
		29	#else
		30	typedef unsigned char uint8_t;
		31	typedef unsigned short uint16_t;
		32	typedef unsigned int uint32_t;
		33	typedef signed char int8_t;
		34	typedef signed short int16_t;
		35	typedef signed int int32_t;
		36	#endif
		37
		38	#include "glext.h"
24		39
25	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
26		41
27	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
28	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
		44
		45	typedef Mix_Chunk *CFClient__MixChunk;
		46	typedef Mix_Music *CFClient__MixMusic;
29		47
30	static PangoContext *context;	48	static PangoContext *context;
31	static PangoFontMap *fontmap;	49	static PangoFontMap *fontmap;
32		50
33	typedef struct cf_layout {	51	typedef struct cf_layout {
47	{	65	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	66	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	67	* reasonably well with bitstream vera
50	*/	68	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	69	PangoFontDescription *font = pango_context_get_font_description (context);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	70
		71	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		72
		73	if (pango_font_description_get_size (font) != height)
		74	{
		75	pango_font_description_set_absolute_size (font, height);
		76	pango_layout_context_changed (self->pl);
		77	}
53	}	78	}
54		79
55	static void	80	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	81	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	82	{
…		…
90	mapface *face;	115	mapface *face;
91		116
92	int texs;	117	int texs;
93	maptex *tex;	118	maptex *tex;
94		119
95	uint32_t rows;	120	int32_t rows;
96	maprow *row;	121	maprow *row;
97	} *CFClient__Map;	122	} *CFClient__Map;
98		123
99	static char *	124	static char *
100	prepend (char *ptr, int sze, int inc)	125	prepend (char *ptr, int sze, int inc)
…		…
195		220
196	static void	221	static void
197	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	222	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
198	{	223	{
199	int x, y;	224	int x, y;
		225	maprow *row;
200		226
201	for (y = y0; y < y0 + h; y++)	227	for (y = y0; y < y0 + h; y++)
202	if (y >= 0)	228	if (y >= 0)
203	{	229	{
204	if (y >= self->rows)	230	if (y >= self->rows)
205	break;	231	break;
206		232
207	maprow *row = self->row + y;	233	row = self->row + y;
208		234
209	for (x = x0; x < x0 + w; x++)	235	for (x = x0; x < x0 + w; x++)
210	if (x >= row->c0)	236	if (x >= row->c0)
211	{	237	{
212	if (x >= row->c1)	238	if (x >= row->c1)
…		…
215	row->col[x - row->c0].darkness = -1;	241	row->col[x - row->c0].darkness = -1;
216	}	242	}
217	}	243	}
218	}	244	}
219		245
		246	static void
		247	music_finished ()
		248	{
		249	SDL_UserEvent ev;
		250
		251	ev.type = SDL_USEREVENT;
		252	ev.code = 0;
		253	ev.data1 = 0;
		254	ev.data2 = 0;
		255
		256	SDL_PushEvent ((SDL_Event *)&ev);
		257	}
		258
220	MODULE = CFClient PACKAGE = CFClient	259	MODULE = CFClient PACKAGE = CFClient
221		260
222	PROTOTYPES: ENABLE	261	PROTOTYPES: ENABLE
223		262
224	BOOT:	263	BOOT:
225	{	264	{
		265	HV *stash = gv_stashpv ("CFClient", 1);
		266	static const struct {
		267	const char *name;
		268	IV iv;
		269	} *civ, const_iv[] = {
		270	# define const_iv(name) { # name, (IV)name }
		271	const_iv (SDL_ACTIVEEVENT),
		272	const_iv (SDL_KEYDOWN),
		273	const_iv (SDL_KEYUP),
		274	const_iv (SDL_MOUSEMOTION),
		275	const_iv (SDL_MOUSEBUTTONDOWN),
		276	const_iv (SDL_MOUSEBUTTONUP),
		277	const_iv (SDL_JOYAXISMOTION),
		278	const_iv (SDL_JOYBALLMOTION),
		279	const_iv (SDL_JOYHATMOTION),
		280	const_iv (SDL_JOYBUTTONDOWN),
		281	const_iv (SDL_JOYBUTTONUP),
		282	const_iv (SDL_QUIT),
		283	const_iv (SDL_SYSWMEVENT),
		284	const_iv (SDL_EVENT_RESERVEDA),
		285	const_iv (SDL_EVENT_RESERVEDB),
		286	const_iv (SDL_VIDEORESIZE),
		287	const_iv (SDL_VIDEOEXPOSE),
		288	const_iv (SDL_USEREVENT),
		289	const_iv (SDLK_KP0),
		290	const_iv (SDLK_KP1),
		291	const_iv (SDLK_KP2),
		292	const_iv (SDLK_KP3),
		293	const_iv (SDLK_KP4),
		294	const_iv (SDLK_KP5),
		295	const_iv (SDLK_KP6),
		296	const_iv (SDLK_KP7),
		297	const_iv (SDLK_KP8),
		298	const_iv (SDLK_KP9),
		299	const_iv (SDLK_KP_PERIOD),
		300	const_iv (SDLK_KP_DIVIDE),
		301	const_iv (SDLK_KP_MULTIPLY),
		302	const_iv (SDLK_KP_MINUS),
		303	const_iv (SDLK_KP_PLUS),
		304	const_iv (SDLK_KP_ENTER),
		305	const_iv (SDLK_KP_EQUALS),
		306	const_iv (SDLK_UP),
		307	const_iv (SDLK_DOWN),
		308	const_iv (SDLK_RIGHT),
		309	const_iv (SDLK_LEFT),
		310	const_iv (SDLK_INSERT),
		311	const_iv (SDLK_HOME),
		312	const_iv (SDLK_END),
		313	const_iv (SDLK_PAGEUP),
		314	const_iv (SDLK_PAGEDOWN),
		315	const_iv (SDLK_F1),
		316	const_iv (SDLK_F2),
		317	const_iv (SDLK_F3),
		318	const_iv (SDLK_F4),
		319	const_iv (SDLK_F5),
		320	const_iv (SDLK_F6),
		321	const_iv (SDLK_F7),
		322	const_iv (SDLK_F8),
		323	const_iv (SDLK_F9),
		324	const_iv (SDLK_F10),
		325	const_iv (SDLK_F11),
		326	const_iv (SDLK_F12),
		327	const_iv (SDLK_F13),
		328	const_iv (SDLK_F14),
		329	const_iv (SDLK_F15),
		330	const_iv (SDLK_NUMLOCK),
		331	const_iv (SDLK_CAPSLOCK),
		332	const_iv (SDLK_SCROLLOCK),
		333	const_iv (SDLK_RSHIFT),
		334	const_iv (SDLK_LSHIFT),
		335	const_iv (SDLK_RCTRL),
		336	const_iv (SDLK_LCTRL),
		337	const_iv (SDLK_RALT),
		338	const_iv (SDLK_LALT),
		339	const_iv (SDLK_RMETA),
		340	const_iv (SDLK_LMETA),
		341	const_iv (SDLK_LSUPER),
		342	const_iv (SDLK_RSUPER),
		343	const_iv (SDLK_MODE),
		344	const_iv (SDLK_COMPOSE),
		345	const_iv (SDLK_HELP),
		346	const_iv (SDLK_PRINT),
		347	const_iv (SDLK_SYSREQ),
		348	const_iv (SDLK_BREAK),
		349	const_iv (SDLK_MENU),
		350	const_iv (SDLK_POWER),
		351	const_iv (SDLK_EURO),
		352	const_iv (SDLK_UNDO),
		353	const_iv (KMOD_NONE),
		354	const_iv (KMOD_LSHIFT),
		355	const_iv (KMOD_RSHIFT),
		356	const_iv (KMOD_LCTRL),
		357	const_iv (KMOD_RCTRL),
		358	const_iv (KMOD_LALT),
		359	const_iv (KMOD_RALT),
		360	const_iv (KMOD_LMETA),
		361	const_iv (KMOD_RMETA),
		362	const_iv (KMOD_NUM),
		363	const_iv (KMOD_CAPS),
		364	const_iv (KMOD_MODE),
		365	const_iv (KMOD_CTRL),
		366	const_iv (KMOD_SHIFT),
		367	const_iv (KMOD_ALT),
		368	const_iv (KMOD_META)
		369	# undef const_iv
		370	};
		371
		372	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		373	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		374
226	fontmap = pango_ft2_font_map_new ();	375	fontmap = pango_ft2_font_map_new ();
227	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	376	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
228	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	377	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
229	}	378	}
		379
		380	int
		381	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
		382
		383	void
		384	SDL_Quit ()
		385
		386	void
		387	SDL_ListModes ()
		388	PPCODE:
		389	{
		390	SDL_Rect **m;
		391
		392	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
		393	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
		394	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
		395	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
		396
		397	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
		398	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
		399	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
		400	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
		401
		402	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		403	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		404	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		405
		406	SDL_EnableUNICODE (1);
		407	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		408
		409	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
		410
		411	if (m && m != (SDL_Rect **)-1)
		412	while (*m)
		413	{
		414	AV *av = newAV ();
		415	av_push (av, newSViv ((*m)->w));
		416	av_push (av, newSViv ((*m)->h));
		417	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		418
		419	++m;
		420	}
		421	}
		422
		423	int
		424	SDL_SetVideoMode (int w, int h, int fullscreen)
		425	CODE:
		426	RETVAL = !!SDL_SetVideoMode (
		427	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
		428	);
		429	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		430	OUTPUT:
		431	RETVAL
		432
		433	void
		434	SDL_GL_SwapBuffers ()
		435
		436	void
		437	SDL_PollEvent ()
		438	PPCODE:
		439	{
		440	SDL_Event ev;
		441
		442	while (SDL_PollEvent (&ev))
		443	{
		444	HV *hv = newHV ();
		445	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		446	switch (ev.type)
		447	{
		448	case SDL_KEYDOWN:
		449	case SDL_KEYUP:
		450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		451	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		452	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		453	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		454	break;
		455
		456	case SDL_ACTIVEEVENT:
		457	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		458	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		459	break;
		460
		461	case SDL_MOUSEMOTION:
		462	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		463	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		464	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		465	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		466	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		467	break;
		468
		469	case SDL_MOUSEBUTTONDOWN:
		470	case SDL_MOUSEBUTTONUP:
		471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		474	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		475	}
		476
		477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		478	}
		479	}
		480
		481	int
		482	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		483	POSTCALL:
		484	Mix_HookMusicFinished (music_finished);
		485
		486	void
		487	Mix_CloseAudio ()
		488
		489	int
		490	Mix_AllocateChannels (int numchans = -1)
230		491
231	void	492	void
232	lowdelay (int fd, int val = 1)	493	lowdelay (int fd, int val = 1)
233	CODE:	494	CODE:
		495	#ifndef _WIN32
234	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	496	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		497	#endif
235		498
236	char *	499	char *
237	gl_version ()	500	gl_version ()
238	CODE:	501	CODE:
239	RETVAL = (char *)glGetString (GL_VERSION);	502	RETVAL = (char *)glGetString (GL_VERSION);
…		…
285	croak ("load_image: %s", SDL_GetError ());	548	croak ("load_image: %s", SDL_GetError ());
286		549
287	fmt.palette = NULL;	550	fmt.palette = NULL;
288	fmt.BitsPerPixel = 32;	551	fmt.BitsPerPixel = 32;
289	fmt.BytesPerPixel = 4;	552	fmt.BytesPerPixel = 4;
		553	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
290	fmt.Rmask = 0x000000ff;	554	fmt.Rmask = 0x000000ff;
291	fmt.Gmask = 0x0000ff00;	555	fmt.Gmask = 0x0000ff00;
292	fmt.Bmask = 0x00ff0000;	556	fmt.Bmask = 0x00ff0000;
293	fmt.Amask = 0xff000000;	557	fmt.Amask = 0xff000000;
		558	#else
		559	fmt.Rmask = 0xff000000;
		560	fmt.Gmask = 0x00ff0000;
		561	fmt.Bmask = 0x0000ff00;
		562	fmt.Amask = 0x000000ff;
		563	#endif
294	fmt.Rloss = 0;	564	fmt.Rloss = 0;
295	fmt.Gloss = 0;	565	fmt.Gloss = 0;
296	fmt.Bloss = 0;	566	fmt.Bloss = 0;
297	fmt.Aloss = 0;	567	fmt.Aloss = 0;
298	fmt.Rshift = 0;	568	fmt.Rshift = 0;
…		…
312	SDL_LockSurface (surface2);	582	SDL_LockSurface (surface2);
313	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	583	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
314	SDL_UnlockSurface (surface2);	584	SDL_UnlockSurface (surface2);
315	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	585	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
316	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	586	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
317	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	587	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
318		588
319	SDL_FreeSurface (surface);	589	SDL_FreeSurface (surface);
320	SDL_FreeSurface (surface2);	590	SDL_FreeSurface (surface2);
321	}	591	}
322		592
…		…
346	}	616	}
347		617
348	void	618	void
349	fatal (char *message)	619	fatal (char *message)
350	CODE:	620	CODE:
351	#ifdef WIN32	621	#ifdef _WIN32
352	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	622	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
353	#else	623	#else
354	fprintf (stderr, "FATAL: %s\n", message);	624	fprintf (stderr, "FATAL: %s\n", message);
355	#endif	625	#endif
356	exit (1);	626	exit (1);
…		…
390	STRLEN textlen;	660	STRLEN textlen;
391	char *text = SvPVutf8 (text_, textlen);	661	char *text = SvPVutf8 (text_, textlen);
392		662
393	pango_layout_set_markup (self->pl, text, textlen);	663	pango_layout_set_markup (self->pl, text, textlen);
394	}	664	}
		665
		666	SV *
		667	get_text (CFClient::Layout self)
		668	CODE:
		669	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		670	SvUTF8_on (RETVAL);
		671	OUTPUT:
		672	RETVAL
395		673
396	void	674	void
397	set_height (CFClient::Layout self, int base_height)	675	set_height (CFClient::Layout self, int base_height)
398	CODE:	676	CODE:
399	self->base_height = base_height;	677	self->base_height = base_height;
…		…
565	{	843	{
566	Append (maptex, self->tex, self->texs, self->texs);	844	Append (maptex, self->tex, self->texs, self->texs);
567	self->texs *= 2;	845	self->texs *= 2;
568	}	846	}
569		847
		848	{
570	maptex *tex = self->tex + texid;	849	maptex *tex = self->tex + texid;
571		850
572	tex->name = name;	851	tex->name = name;
573	tex->w = w;	852	tex->w = w;
574	tex->h = h;	853	tex->h = h;
575	tex->s = s;	854	tex->s = s;
576	tex->t = t;	855	tex->t = t;
577	tex->r = r;	856	tex->r = r;
578	tex->g = g;	857	tex->g = g;
579	tex->b = b;	858	tex->b = b;
580	tex->a = a;	859	tex->a = a;
		860	}
581	}	861	}
582		862
583	int	863	int
584	ox (CFClient::Map self)	864	ox (CFClient::Map self)
585	ALIAS:	865	ALIAS:
…		…
623	map1a_update (CFClient::Map self, SV *data_)	903	map1a_update (CFClient::Map self, SV *data_)
624	CODE:	904	CODE:
625	{	905	{
626	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	906	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
627	uint8_t data_end = (uint8_t )SvEND (data_);	907	uint8_t data_end = (uint8_t )SvEND (data_);
		908	mapcell *cell;
		909	int x, y, flags;
628		910
629	while (data < data_end)	911	while (data < data_end)
630	{	912	{
631	int flags = (data [0] << 8) + data [1]; data += 2;	913	flags = (data [0] << 8) + data [1]; data += 2;
632		914
633	int x = ((flags >> 10) & 63) + self->x;	915	x = ((flags >> 10) & 63) + self->x;
634	int y = ((flags >> 4) & 63) + self->y;	916	y = ((flags >> 4) & 63) + self->y;
635		917
636	mapcell *cell = map_get_cell (self, x, y);	918	cell = map_get_cell (self, x, y);
637		919
638	if (flags & 15)	920	if (flags & 15)
639	{	921	{
640	if (cell->darkness < 0) // && x < self->w && y < self->h)	922	if (cell->darkness < 0)
641	{	923	{
642	cell->darkness = 0;	924	cell->darkness = 0;
643	cell->face [0] = 0;	925	cell->face [0] = 0;
644	cell->face [1] = 0;	926	cell->face [1] = 0;
645	cell->face [2] = 0;	927	cell->face [2] = 0;
646	}	928	}
647		929
648	cell->darkness = flags & 8 ? *data++ : 255;	930	cell->darkness = flags & 8 ? *data++ : 255;
649		931
650	//TODO: don't trust server data to be in-range(!)	932	//TODO: don't trust server data to be in-range(!)
651		933
652	if (flags & 4)	934	if (flags & 4)
…		…
668	cell->darkness = -1;	950	cell->darkness = -1;
669	}	951	}
670	}	952	}
671		953
672	SV *	954	SV *
673	mapmap (CFClient::Map self, int w, int h)	955	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
674	CODE:	956	CODE:
675	{	957	{
676	int x0, x1, x;	958	int x1, x;
677	int y0, y1, y;	959	int y1, y;
678	int z;	960	int z;
679	SV map_sv = newSV (w h * sizeof (uint32_t));	961	SV map_sv = newSV (w h * sizeof (uint32_t));
680	uint32_t map = (uint32_t )SvPVX (map_sv);	962	uint32_t map = (uint32_t )SvPVX (map_sv);
681		963
682	SvPOK_only (map_sv);	964	SvPOK_only (map_sv);
683	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	965	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
684		966
685	x0 = self->x - w / 2; x1 = x0 + w;	967	x0 += self->x; x1 = x0 + w;
686	y0 = self->y - h / 2; y1 = y0 + h;	968	y0 += self->y; y1 = y0 + h;
687		969
688	for (y = y0; y < y1; y++)	970	for (y = y0; y < y1; y++)
689	{	971	{
690	maprow *row = 0 <= y && y < self->rows	972	maprow *row = 0 <= y && y < self->rows
691	? self->row + y	973	? self->row + y
…		…
731		1013
732	void	1014	void
733	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1015	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
734	PPCODE:	1016	PPCODE:
735	{	1017	{
		1018	int vx, vy;
		1019	int x, y, z;
		1020	int last_name;
		1021	mapface face;
736	int sw4 = (sw + 3) & ~3;	1022	int sw4 = (sw + 3) & ~3;
737	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1023	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
738	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1024	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1025
739	memset (darkness, 255, sw4 * sh);	1026	memset (darkness, 255, sw4 * sh);
740	SvPOK_only (darkness_sv);	1027	SvPOK_only (darkness_sv);
741	SvCUR_set (darkness_sv, sw4 * sh);	1028	SvCUR_set (darkness_sv, sw4 * sh);
742		1029
743	int vx = self->x + (self->w - sw) / 2 - shift_x;	1030	vx = self->x + (self->w - sw) / 2 - shift_x;
744	int vy = self->y + (self->h - sh) / 2 - shift_y;	1031	vy = self->y + (self->h - sh) / 2 - shift_y;
745		1032
746	/*	1033	/*
747	int vx = self->vx = self->w >= sw	1034	int vx = self->vx = self->w >= sw
748	? self->x + (self->w - sw) / 2	1035	? self->x + (self->w - sw) / 2
749	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1036	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
758	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1045	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
759	glEnable (GL_BLEND);	1046	glEnable (GL_BLEND);
760	glEnable (GL_TEXTURE_2D);	1047	glEnable (GL_TEXTURE_2D);
761	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1048	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
762		1049
763	int x, y, z;
764
765	int last_name = 0;
766
767	glBegin (GL_QUADS);	1050	glBegin (GL_QUADS);
		1051
		1052	last_name = 0;
768		1053
769	for (z = 0; z < 3; z++)	1054	for (z = 0; z < 3; z++)
770	for (y = 0; y < sh; y++)	1055	for (y = 0; y < sh; y++)
771	if (0 <= y + vy && y + vy < self->rows)	1056	if (0 <= y + vy && y + vy < self->rows)
772	{	1057	{
…		…
779		1064
780	darkness[y * sw4 + x] = cell->darkness < 0	1065	darkness[y * sw4 + x] = cell->darkness < 0
781	? 255 - FOW_DARKNESS	1066	? 255 - FOW_DARKNESS
782	: 255 - cell->darkness;	1067	: 255 - cell->darkness;
783		1068
784	mapface face = cell->face [z];	1069	face = cell->face [z];
785		1070
786	if (face)	1071	if (face)
787	{	1072	{
788	maptex tex = self->tex [face];	1073	maptex tex = self->tex [face];
789		1074
…		…
828	data++ = 0; / version 0 format */	1113	data++ = 0; / version 0 format */
829	data++ = w >> 8; data++ = w;	1114	data++ = w >> 8; data++ = w;
830	data++ = h >> 8; data++ = h;	1115	data++ = h >> 8; data++ = h;
831		1116
832	// we need to do this 'cause we don't keep an absolute coord system for rows	1117	// we need to do this 'cause we don't keep an absolute coord system for rows
833	// TODO: treat rows as we treat	1118	// TODO: treat rows as we treat columns
834	map_get_row (self, y0 + self->y - self->oy);//D	1119	map_get_row (self, y0 + self->y - self->oy);//D
835	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1120	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
836		1121
837	x0 += self->x - self->ox;	1122	x0 += self->x - self->ox;
838	y0 += self->y - self->oy;	1123	y0 += self->y - self->oy;
…		…
849	for (x = x0; x < x1; x++)	1134	for (x = x0; x < x1; x++)
850	{	1135	{
851	if (row && row->c0 <= x && x < row->c1)	1136	if (row && row->c0 <= x && x < row->c1)
852	{	1137	{
853	mapcell *cell = row->col + (x - row->c0);	1138	mapcell *cell = row->col + (x - row->c0);
854
855	uint8_t flags = 0;	1139	uint8_t flags = 0;
856		1140
857	if (cell->face [0]) flags \|= 1;	1141	if (cell->face [0]) flags \|= 1;
858	if (cell->face [1]) flags \|= 2;	1142	if (cell->face [1]) flags \|= 2;
859	if (cell->face [2]) flags \|= 4;	1143	if (cell->face [2]) flags \|= 4;
…		…
893	void	1177	void
894	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1178	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
895	PPCODE:	1179	PPCODE:
896	{	1180	{
897	int x, y, z;	1181	int x, y, z;
		1182	int w, h;
898	int x1, y1;	1183	int x1, y1;
899		1184
900	if (*data++ != 0)	1185	if (*data++ != 0)
901	return; /* version mismatch */	1186	return; /* version mismatch */
902		1187
903	int w = data++ << 8; w \|= data++;	1188	w = data++ << 8; w \|= data++;
904	int h = data++ << 8; h \|= data++;	1189	h = data++ << 8; h \|= data++;
905		1190
906	// we need to do this 'cause we don't keep an absolute coord system for rows	1191	// we need to do this 'cause we don't keep an absolute coord system for rows
907	// TODO: treat rows as we treat	1192	// TODO: treat rows as we treat columns
908	map_get_row (self, y0 + self->y - self->oy);//D	1193	map_get_row (self, y0 + self->y - self->oy);//D
909	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1194	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
910		1195
911	x0 += self->x - self->ox;	1196	x0 += self->x - self->ox;
912	y0 += self->y - self->oy;	1197	y0 += self->y - self->oy;
…		…
947	}	1232	}
948	}	1233	}
949	}	1234	}
950	}	1235	}
951		1236
		1237	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1238
		1239	CFClient::MixChunk
		1240	new_from_file (SV class, char path)
		1241	CODE:
		1242	RETVAL = Mix_LoadWAV (path);
		1243	OUTPUT:
		1244	RETVAL
		1245
		1246	void
		1247	DESTROY (CFClient::MixChunk self)
		1248	CODE:
		1249	Mix_FreeChunk (self);
		1250
		1251	int
		1252	volume (CFClient::MixChunk self, int volume = -1)
		1253	CODE:
		1254	RETVAL = Mix_VolumeChunk (self, volume);
		1255	OUTPUT:
		1256	RETVAL
		1257
		1258	int
		1259	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1260	CODE:
		1261	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1262	OUTPUT:
		1263	RETVAL
		1264
		1265	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1266
		1267	int
		1268	volume (int volume = -1)
		1269	CODE:
		1270	RETVAL = Mix_VolumeMusic (volume);
		1271	OUTPUT:
		1272	RETVAL
		1273
		1274	CFClient::MixMusic
		1275	new_from_file (SV class, char path)
		1276	CODE:
		1277	RETVAL = Mix_LoadMUS (path);
		1278	OUTPUT:
		1279	RETVAL
		1280
		1281	void
		1282	DESTROY (CFClient::MixMusic self)
		1283	CODE:
		1284	Mix_FreeMusic (self);
		1285
		1286	int
		1287	play (CFClient::MixMusic self, int loops = -1)
		1288	CODE:
		1289	RETVAL = Mix_PlayMusic (self, loops);
		1290	OUTPUT:
		1291	RETVAL
		1292
		1293	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1294
		1295	BOOT:
		1296	{
		1297	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1298	static const struct {
		1299	const char *name;
		1300	IV iv;
		1301	} *civ, const_iv[] = {
		1302	# define const_iv(name) { # name, (IV)name }
		1303	const_iv (GL_COLOR_MATERIAL),
		1304	const_iv (GL_SMOOTH),
		1305	const_iv (GL_FLAT),
		1306	const_iv (GL_BLEND),
		1307	const_iv (GL_AND),
		1308	const_iv (GL_SRC_ALPHA),
		1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1310	const_iv (GL_RGB),
		1311	const_iv (GL_RGBA),
		1312	const_iv (GL_UNSIGNED_BYTE),
		1313	const_iv (GL_ALPHA4),
		1314	const_iv (GL_ALPHA),
		1315	const_iv (GL_FLOAT),
		1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1317	const_iv (GL_COMPILE),
		1318	const_iv (GL_TEXTURE_1D),
		1319	const_iv (GL_TEXTURE_2D),
		1320	const_iv (GL_TEXTURE_ENV),
		1321	const_iv (GL_TEXTURE_MAG_FILTER),
		1322	const_iv (GL_TEXTURE_MIN_FILTER),
		1323	const_iv (GL_TEXTURE_ENV_MODE),
		1324	const_iv (GL_TEXTURE_WRAP_S),
		1325	const_iv (GL_TEXTURE_WRAP_T),
		1326	const_iv (GL_CLAMP),
		1327	const_iv (GL_REPEAT),
		1328	const_iv (GL_NEAREST),
		1329	const_iv (GL_LINEAR),
		1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1334	const_iv (GL_GENERATE_MIPMAP),
		1335	const_iv (GL_LINEAR),
		1336	const_iv (GL_MODULATE),
		1337	const_iv (GL_REPLACE),
		1338	const_iv (GL_COLOR_BUFFER_BIT),
		1339	const_iv (GL_PROJECTION),
		1340	const_iv (GL_MODELVIEW),
		1341	const_iv (GL_COLOR_LOGIC_OP),
		1342	const_iv (GL_CONVOLUTION_2D),
		1343	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1344	const_iv (GL_CONSTANT_BORDER),
		1345	const_iv (GL_LINES),
		1346	const_iv (GL_QUADS),
		1347	const_iv (GL_LINE_LOOP),
		1348	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1349	const_iv (GL_FASTEST),
		1350	# undef const_iv
		1351	};
		1352
		1353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1355	}
		1356
		1357	int glGetError ()
		1358
		1359	void glClear (int mask)
		1360
		1361	void glClearColor (float r, float g, float b, float a = 1.0)
		1362	PROTOTYPE: @
		1363
		1364	void glEnable (int cap)
		1365
		1366	void glDisable (int cap)
		1367
		1368	void glShadeModel (int mode)
		1369
		1370	void glHint (int target, int mode)
		1371
		1372	void glBlendFunc (int sfactor, int dfactor)
		1373
		1374	void glLogicOp (int opcode)
		1375
		1376	void glMatrixMode (int mode)
		1377
		1378	void glPushMatrix ()
		1379
		1380	void glPopMatrix ()
		1381
		1382	void glLoadIdentity ()
		1383
		1384	void glOrtho (double left, double right, double bottom, double top, double near, double far)
		1385
		1386	void glViewport (int x, int y, int width, int height)
		1387
		1388	void glTranslate (float x, float y, float z = 0.)
		1389	CODE:
		1390	glTranslatef (x, y, z);
		1391
		1392	void glScale (float x, float y, float z)
		1393	CODE:
		1394	glScalef (x, y, z);
		1395
		1396	void glRotate (float angle, float x, float y, float z)
		1397	CODE:
		1398	glRotatef (angle, x, y, z);
		1399
		1400	void glBegin (int mode)
		1401
		1402	void glEnd ()
		1403
		1404	void glColor (float r, float g, float b, float a = 1.0)
		1405	PROTOTYPE: @
		1406	CODE:
		1407	glColor4f (r, g, b, a);
		1408
		1409	void glVertex (float x, float y, float z = 0.)
		1410	CODE:
		1411	glVertex3f (x, y, z);
		1412
		1413	void glTexCoord (float s, float t)
		1414	CODE:
		1415	glTexCoord2f (s, t);
		1416
		1417	void glTexEnv (int target, int pname, float param)
		1418	CODE:
		1419	glTexEnvf (target, pname, param);
		1420
		1421	void glTexParameter (int target, int pname, float param)
		1422	CODE:
		1423	glTexParameterf (target, pname, param);
		1424
		1425	void glBindTexture (int target, int name)
		1426
		1427	void glConvolutionParameter (int target, int pname, float params)
		1428	CODE:
		1429	glConvolutionParameterf (target, pname, params);
		1430
		1431	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1432
		1433	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1434
		1435	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1436
		1437	int glGenTexture ()
		1438	CODE:
		1439	{
		1440	GLuint name;
		1441	glGenTextures (1, &name);
		1442	RETVAL = name;
		1443	}
		1444	OUTPUT:
		1445	RETVAL
		1446
		1447	void glDeleteTexture (int name)
		1448	CODE:
		1449	{
		1450	GLuint name_ = name;
		1451	glDeleteTextures (1, &name_);
		1452	}
		1453
		1454	int glGenList ()
		1455	CODE:
		1456	RETVAL = glGenLists (1);
		1457	OUTPUT:
		1458	RETVAL
		1459
		1460	void glDeleteList (int list)
		1461	CODE:
		1462	glDeleteLists (list, 1);
		1463
		1464	void glNewList (int list, int mode = GL_COMPILE)
		1465
		1466	void glEndList ()
		1467
		1468	void glCallList (int list)
		1469

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.44 by root, Mon Apr 17 07:30:20 2006 UTC vs. Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.44 by root, Mon Apr 17 07:30:20 2006 UTC vs.
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC