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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.51 by root, Wed Apr 19 20:46:44 2006 UTC vs.
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC

…		…
9	#include <string.h>	9	#include <string.h>
10	#include <stdio.h>	10	#include <stdio.h>
11		11
12	#include <SDL.h>	12	#include <SDL.h>
13	#include <SDL_image.h>	13	#include <SDL_image.h>
		14	#include <SDL_mixer.h>
14	#include <SDL_opengl.h>	15	#include <SDL_opengl.h>
15		16
16	#include <glib/gmacros.h>	17	#include <glib/gmacros.h>
17		18
18	#include <pango/pango.h>	19	#include <pango/pango.h>
…		…
32	typedef signed char int8_t;	33	typedef signed char int8_t;
33	typedef signed short int16_t;	34	typedef signed short int16_t;
34	typedef signed int int32_t;	35	typedef signed int int32_t;
35	#endif	36	#endif
36		37
		38	#include "glext.h"
		39
37	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
38		41
39	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
40	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
		44
		45	typedef Mix_Chunk *CFClient__MixChunk;
		46	typedef Mix_Music *CFClient__MixMusic;
41		47
42	static PangoContext *context;	48	static PangoContext *context;
43	static PangoFontMap *fontmap;	49	static PangoFontMap *fontmap;
44		50
45	typedef struct cf_layout {	51	typedef struct cf_layout {
…		…
233	break;	239	break;
234		240
235	row->col[x - row->c0].darkness = -1;	241	row->col[x - row->c0].darkness = -1;
236	}	242	}
237	}	243	}
		244	}
		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);
238	}	257	}
239		258
240	MODULE = CFClient PACKAGE = CFClient	259	MODULE = CFClient PACKAGE = CFClient
241		260
242	PROTOTYPES: ENABLE	261	PROTOTYPES: ENABLE
…		…
382		401
383	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	402	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
384	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	403	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
385	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	404	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
386		405
		406	SDL_EnableUNICODE (1);
		407	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		408
387	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	409	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
388		410
389	if (m && m != (SDL_Rect **)-1)	411	if (m && m != (SDL_Rect **)-1)
390	while (*m)	412	while (*m)
391	{	413	{
…		…
405	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	427	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
406	);	428	);
407	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	429	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
408	OUTPUT:	430	OUTPUT:
409	RETVAL	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)
410		491
411	void	492	void
412	lowdelay (int fd, int val = 1)	493	lowdelay (int fd, int val = 1)
413	CODE:	494	CODE:
414	#ifndef _WIN32	495	#ifndef _WIN32
…		…
869	cell->darkness = -1;	950	cell->darkness = -1;
870	}	951	}
871	}	952	}
872		953
873	SV *	954	SV *
874	mapmap (CFClient::Map self, int w, int h)	955	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
875	CODE:	956	CODE:
876	{	957	{
877	int x0, x1, x;	958	int x1, x;
878	int y0, y1, y;	959	int y1, y;
879	int z;	960	int z;
880	SV map_sv = newSV (w h * sizeof (uint32_t));	961	SV map_sv = newSV (w h * sizeof (uint32_t));
881	uint32_t map = (uint32_t )SvPVX (map_sv);	962	uint32_t map = (uint32_t )SvPVX (map_sv);
882		963
883	SvPOK_only (map_sv);	964	SvPOK_only (map_sv);
884	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	965	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
885		966
886	x0 = self->x - w / 2; x1 = x0 + w;	967	x0 += self->x; x1 = x0 + w;
887	y0 = self->y - h / 2; y1 = y0 + h;	968	y0 += self->y; y1 = y0 + h;
888		969
889	for (y = y0; y < y1; y++)	970	for (y = y0; y < y1; y++)
890	{	971	{
891	maprow *row = 0 <= y && y < self->rows	972	maprow *row = 0 <= y && y < self->rows
892	? self->row + y	973	? self->row + y
…		…
1032	data++ = 0; / version 0 format */	1113	data++ = 0; / version 0 format */
1033	data++ = w >> 8; data++ = w;	1114	data++ = w >> 8; data++ = w;
1034	data++ = h >> 8; data++ = h;	1115	data++ = h >> 8; data++ = h;
1035		1116
1036	// 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
1037	// TODO: treat rows as we treat	1118	// TODO: treat rows as we treat columns
1038	map_get_row (self, y0 + self->y - self->oy);//D	1119	map_get_row (self, y0 + self->y - self->oy);//D
1039	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
1040		1121
1041	x0 += self->x - self->ox;	1122	x0 += self->x - self->ox;
1042	y0 += self->y - self->oy;	1123	y0 += self->y - self->oy;
…		…
1106		1187
1107	w = data++ << 8; w \|= data++;	1188	w = data++ << 8; w \|= data++;
1108	h = data++ << 8; h \|= data++;	1189	h = data++ << 8; h \|= data++;
1109		1190
1110	// 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
1111	// TODO: treat rows as we treat	1192	// TODO: treat rows as we treat columns
1112	map_get_row (self, y0 + self->y - self->oy);//D	1193	map_get_row (self, y0 + self->y - self->oy);//D
1113	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
1114		1195
1115	x0 += self->x - self->ox;	1196	x0 += self->x - self->ox;
1116	y0 += self->y - self->oy;	1197	y0 += self->y - self->oy;
…		…
1151	}	1232	}
1152	}	1233	}
1153	}	1234	}
1154	}	1235	}
1155		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.51 by root, Wed Apr 19 20:46:44 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.51 by root, Wed Apr 19 20:46:44 2006 UTC vs.
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC