[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.55 by root, Thu Apr 20 08:11:56 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>
…		…
36		37
37	#define FOW_DARKNESS 32	38	#define FOW_DARKNESS 32
38		39
39	#define MAP_EXTEND_X 32	40	#define MAP_EXTEND_X 32
40	#define MAP_EXTEND_Y 512	41	#define MAP_EXTEND_Y 512
		42
		43	typedef Mix_Chunk *CFClient__MixChunk;
		44	typedef Mix_Music *CFClient__MixMusic;
41		45
42	static PangoContext *context;	46	static PangoContext *context;
43	static PangoFontMap *fontmap;	47	static PangoFontMap *fontmap;
44		48
45	typedef struct cf_layout {	49	typedef struct cf_layout {
…		…
382		386
383	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
384	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
385	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
386		390
		391	SDL_EnableUNICODE (1);
		392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		393
387	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	394	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
388		395
389	if (m && m != (SDL_Rect **)-1)	396	if (m && m != (SDL_Rect **)-1)
390	while (*m)	397	while (*m)
391	{	398	{
…		…
405	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	412	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
406	);	413	);
407	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	414	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
408	OUTPUT:	415	OUTPUT:
409	RETVAL	416	RETVAL
		417
		418	void
		419	SDL_GL_SwapBuffers ()
		420
		421	void
		422	SDL_PollEvent ()
		423	PPCODE:
		424	{
		425	SDL_Event ev;
		426
		427	while (SDL_PollEvent (&ev))
		428	{
		429	HV *hv = newHV ();
		430	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		431	switch (ev.type)
		432	{
		433	case SDL_KEYDOWN:
		434	case SDL_KEYUP:
		435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		436	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		437	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		438	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		439	break;
		440
		441	case SDL_ACTIVEEVENT:
		442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		444	break;
		445
		446	case SDL_MOUSEMOTION:
		447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		452	break;
		453
		454	case SDL_MOUSEBUTTONDOWN:
		455	case SDL_MOUSEBUTTONUP:
		456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		460	}
		461
		462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		463	}
		464	}
		465
		466	int
		467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		468
		469	void
		470	Mix_CloseAudio ()
		471
		472	int
		473	Mix_AllocateChannels (int numchans = -1)
410		474
411	void	475	void
412	lowdelay (int fd, int val = 1)	476	lowdelay (int fd, int val = 1)
413	CODE:	477	CODE:
414	#ifndef _WIN32	478	#ifndef _WIN32
…		…
869	cell->darkness = -1;	933	cell->darkness = -1;
870	}	934	}
871	}	935	}
872		936
873	SV *	937	SV *
874	mapmap (CFClient::Map self, int w, int h)	938	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
875	CODE:	939	CODE:
876	{	940	{
877	int x0, x1, x;	941	int x1, x;
878	int y0, y1, y;	942	int y1, y;
879	int z;	943	int z;
880	SV map_sv = newSV (w h * sizeof (uint32_t));	944	SV map_sv = newSV (w h * sizeof (uint32_t));
881	uint32_t map = (uint32_t )SvPVX (map_sv);	945	uint32_t map = (uint32_t )SvPVX (map_sv);
882		946
883	SvPOK_only (map_sv);	947	SvPOK_only (map_sv);
884	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
885		949
886	x0 = self->x - w / 2; x1 = x0 + w;	950	x0 += self->x; x1 = x0 + w;
887	y0 = self->y - h / 2; y1 = y0 + h;	951	y0 += self->y; y1 = y0 + h;
888		952
889	for (y = y0; y < y1; y++)	953	for (y = y0; y < y1; y++)
890	{	954	{
891	maprow *row = 0 <= y && y < self->rows	955	maprow *row = 0 <= y && y < self->rows
892	? self->row + y	956	? self->row + y
…		…
1032	data++ = 0; / version 0 format */	1096	data++ = 0; / version 0 format */
1033	data++ = w >> 8; data++ = w;	1097	data++ = w >> 8; data++ = w;
1034	data++ = h >> 8; data++ = h;	1098	data++ = h >> 8; data++ = h;
1035		1099
1036	// we need to do this 'cause we don't keep an absolute coord system for rows	1100	// we need to do this 'cause we don't keep an absolute coord system for rows
1037	// TODO: treat rows as we treat	1101	// TODO: treat rows as we treat columns
1038	map_get_row (self, y0 + self->y - self->oy);//D	1102	map_get_row (self, y0 + self->y - self->oy);//D
1039	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1040		1104
1041	x0 += self->x - self->ox;	1105	x0 += self->x - self->ox;
1042	y0 += self->y - self->oy;	1106	y0 += self->y - self->oy;
…		…
1106		1170
1107	w = data++ << 8; w \|= data++;	1171	w = data++ << 8; w \|= data++;
1108	h = data++ << 8; h \|= data++;	1172	h = data++ << 8; h \|= data++;
1109		1173
1110	// we need to do this 'cause we don't keep an absolute coord system for rows	1174	// we need to do this 'cause we don't keep an absolute coord system for rows
1111	// TODO: treat rows as we treat	1175	// TODO: treat rows as we treat columns
1112	map_get_row (self, y0 + self->y - self->oy);//D	1176	map_get_row (self, y0 + self->y - self->oy);//D
1113	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1114		1178
1115	x0 += self->x - self->ox;	1179	x0 += self->x - self->ox;
1116	y0 += self->y - self->oy;	1180	y0 += self->y - self->oy;
…		…
1151	}	1215	}
1152	}	1216	}
1153	}	1217	}
1154	}	1218	}
1155		1219
		1220	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1221
		1222	CFClient::MixChunk
		1223	new_from_file (SV class, char path)
		1224	CODE:
		1225	RETVAL = Mix_LoadWAV (path);
		1226	OUTPUT:
		1227	RETVAL
		1228
		1229	void
		1230	DESTROY (CFClient::MixChunk self)
		1231	CODE:
		1232	Mix_FreeChunk (self);
		1233
		1234	int
		1235	volume (CFClient::MixChunk self, int volume = -1)
		1236	CODE:
		1237	RETVAL = Mix_VolumeChunk (self, volume);
		1238	OUTPUT:
		1239	RETVAL
		1240
		1241	int
		1242	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1243	CODE:
		1244	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1245	OUTPUT:
		1246	RETVAL
		1247
		1248	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1249
		1250	int
		1251	volume (int volume = -1)
		1252	CODE:
		1253	RETVAL = Mix_VolumeMusic (volume);
		1254	OUTPUT:
		1255	RETVAL
		1256
		1257	CFClient::MixMusic
		1258	new_from_file (SV class, char path)
		1259	CODE:
		1260	RETVAL = Mix_LoadMUS (path);
		1261	OUTPUT:
		1262	RETVAL
		1263
		1264	void
		1265	DESTROY (CFClient::MixMusic self)
		1266	CODE:
		1267	Mix_FreeMusic (self);
		1268
		1269	int
		1270	play (CFClient::MixMusic self, int loops = -1)
		1271	CODE:
		1272	RETVAL = Mix_PlayMusic (self, loops);
		1273	OUTPUT:
		1274	RETVAL
		1275
		1276	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1277
		1278	BOOT:
		1279	{
		1280	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1281	static const struct {
		1282	const char *name;
		1283	IV iv;
		1284	} *civ, const_iv[] = {
		1285	# define const_iv(name) { # name, (IV)name }
		1286	const_iv (GL_COLOR_MATERIAL),
		1287	const_iv (GL_SMOOTH),
		1288	const_iv (GL_FLAT),
		1289	const_iv (GL_BLEND),
		1290	const_iv (GL_AND),
		1291	const_iv (GL_SRC_ALPHA),
		1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1293	const_iv (GL_RGB),
		1294	const_iv (GL_RGBA),
		1295	const_iv (GL_UNSIGNED_BYTE),
		1296	const_iv (GL_ALPHA4),
		1297	const_iv (GL_ALPHA),
		1298	const_iv (GL_FLOAT),
		1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1300	const_iv (GL_COMPILE),
		1301	const_iv (GL_TEXTURE_1D),
		1302	const_iv (GL_TEXTURE_2D),
		1303	const_iv (GL_TEXTURE_ENV),
		1304	const_iv (GL_TEXTURE_MAG_FILTER),
		1305	const_iv (GL_TEXTURE_MIN_FILTER),
		1306	const_iv (GL_TEXTURE_ENV_MODE),
		1307	const_iv (GL_TEXTURE_WRAP_S),
		1308	const_iv (GL_TEXTURE_WRAP_T),
		1309	const_iv (GL_CLAMP),
		1310	const_iv (GL_REPEAT),
		1311	const_iv (GL_NEAREST),
		1312	const_iv (GL_LINEAR),
		1313	const_iv (GL_MODULATE),
		1314	const_iv (GL_REPLACE),
		1315	const_iv (GL_COLOR_BUFFER_BIT),
		1316	const_iv (GL_PROJECTION),
		1317	const_iv (GL_MODELVIEW),
		1318	const_iv (GL_COLOR_LOGIC_OP),
		1319	const_iv (GL_CONVOLUTION_2D),
		1320	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1321	const_iv (GL_CONSTANT_BORDER),
		1322	const_iv (GL_LINES),
		1323	const_iv (GL_QUADS),
		1324	const_iv (GL_LINE_LOOP),
		1325	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1326	const_iv (GL_FASTEST),
		1327	# undef const_iv
		1328	};
		1329
		1330	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1331	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1332	}
		1333
		1334	int glGetError ()
		1335
		1336	void glClear (int mask)
		1337
		1338	void glClearColor (float r, float g, float b, float a = 1.0)
		1339	PROTOTYPE: @
		1340
		1341	void glEnable (int cap)
		1342
		1343	void glDisable (int cap)
		1344
		1345	void glShadeModel (int mode)
		1346
		1347	void glHint (int target, int mode)
		1348
		1349	void glBlendFunc (int sfactor, int dfactor)
		1350
		1351	void glLogicOp (int opcode)
		1352
		1353	void glMatrixMode (int mode)
		1354
		1355	void glPushMatrix ()
		1356
		1357	void glPopMatrix ()
		1358
		1359	void glLoadIdentity ()
		1360
		1361	void glOrtho (double left, double right, double bottom, double top, double near, double far)
		1362
		1363	void glViewport (int x, int y, int width, int height)
		1364
		1365	void glTranslate (float x, float y, float z = 0.)
		1366	CODE:
		1367	glTranslatef (x, y, z);
		1368
		1369	void glScale (float x, float y, float z)
		1370	CODE:
		1371	glScalef (x, y, z);
		1372
		1373	void glRotate (float angle, float x, float y, float z)
		1374	CODE:
		1375	glRotatef (angle, x, y, z);
		1376
		1377	void glBegin (int mode)
		1378
		1379	void glEnd ()
		1380
		1381	void glColor (float r, float g, float b, float a = 1.0)
		1382	PROTOTYPE: @
		1383	CODE:
		1384	glColor4f (r, g, b, a);
		1385
		1386	void glVertex (float x, float y, float z = 0.)
		1387	CODE:
		1388	glVertex3f (x, y, z);
		1389
		1390	void glTexCoord (float s, float t)
		1391	CODE:
		1392	glTexCoord2f (s, t);
		1393
		1394	void glTexEnv (int target, int pname, float param)
		1395	CODE:
		1396	glTexEnvf (target, pname, param);
		1397
		1398	void glTexParameter (int target, int pname, float param)
		1399	CODE:
		1400	glTexParameterf (target, pname, param);
		1401
		1402	void glBindTexture (int target, int name)
		1403
		1404	void glConvolutionParameter (int target, int pname, float params)
		1405	CODE:
		1406	glConvolutionParameterf (target, pname, params);
		1407
		1408	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1409
		1410	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1411
		1412	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1413
		1414	int glGenTexture ()
		1415	CODE:
		1416	{
		1417	GLuint name;
		1418	glGenTextures (1, &name);
		1419	RETVAL = name;
		1420	}
		1421	OUTPUT:
		1422	RETVAL
		1423
		1424	void glDeleteTexture (int name)
		1425	CODE:
		1426	{
		1427	GLuint name_ = name;
		1428	glDeleteTextures (1, &name_);
		1429	}
		1430
		1431	int glGenList ()
		1432	CODE:
		1433	RETVAL = glGenLists (1);
		1434	OUTPUT:
		1435	RETVAL
		1436
		1437	void glDeleteList (int list)
		1438	CODE:
		1439	glDeleteLists (list, 1);
		1440
		1441	void glNewList (int list, int mode = GL_COMPILE)
		1442
		1443	void glEndList ()
		1444
		1445	void glCallList (int list)
		1446

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.55 by root, Thu Apr 20 08:11:56 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.55 by root, Thu Apr 20 08:11:56 2006 UTC