[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.58 by root, Sun Apr 23 00:57:38 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	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE
		46
		47	typedef Mix_Chunk *CFClient__MixChunk;
		48	typedef Mix_Music *CFClient__MixMusic;
41		49
42	static PangoContext *context;	50	static PangoContext *context;
43	static PangoFontMap *fontmap;	51	static PangoFontMap *fontmap;
44		52
45	typedef struct cf_layout {	53	typedef struct cf_layout {
…		…
61	* reasonably well with bitstream vera	69	* reasonably well with bitstream vera
62	*/	70	*/
63	PangoFontDescription *font = pango_context_get_font_description (context);	71	PangoFontDescription *font = pango_context_get_font_description (context);
64		72
65	int height = self->base_height * (PANGO_SCALE * 8 / 10);	73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		74
		75	if (height < MIN_FONT_HEIGHT)
		76	height = MIN_FONT_HEIGHT;
66		77
67	if (pango_font_description_get_size (font) != height)	78	if (pango_font_description_get_size (font) != height)
68	{	79	{
69	pango_font_description_set_absolute_size (font, height);	80	pango_font_description_set_absolute_size (font, height);
70	pango_layout_context_changed (self->pl);	81	pango_layout_context_changed (self->pl);
…		…
233	break;	244	break;
234		245
235	row->col[x - row->c0].darkness = -1;	246	row->col[x - row->c0].darkness = -1;
236	}	247	}
237	}	248	}
		249	}
		250
		251	static void
		252	music_finished ()
		253	{
		254	SDL_UserEvent ev;
		255
		256	ev.type = SDL_USEREVENT;
		257	ev.code = 0;
		258	ev.data1 = 0;
		259	ev.data2 = 0;
		260
		261	SDL_PushEvent ((SDL_Event *)&ev);
238	}	262	}
239		263
240	MODULE = CFClient PACKAGE = CFClient	264	MODULE = CFClient PACKAGE = CFClient
241		265
242	PROTOTYPES: ENABLE	266	PROTOTYPES: ENABLE
…		…
382		406
383	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	407	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
384	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	408	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
385	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	409	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
386		410
		411	SDL_EnableUNICODE (1);
		412	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		413
387	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	414	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
388		415
389	if (m && m != (SDL_Rect **)-1)	416	if (m && m != (SDL_Rect **)-1)
390	while (*m)	417	while (*m)
391	{	418	{
…		…
405	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	432	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
406	);	433	);
407	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	434	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
408	OUTPUT:	435	OUTPUT:
409	RETVAL	436	RETVAL
		437
		438	void
		439	SDL_GL_SwapBuffers ()
		440
		441	void
		442	SDL_PollEvent ()
		443	PPCODE:
		444	{
		445	SDL_Event ev;
		446
		447	while (SDL_PollEvent (&ev))
		448	{
		449	HV *hv = newHV ();
		450	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		451	switch (ev.type)
		452	{
		453	case SDL_KEYDOWN:
		454	case SDL_KEYUP:
		455	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
		456	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
		457	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		458	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
		459	break;
		460
		461	case SDL_ACTIVEEVENT:
		462	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
		463	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
		464	break;
		465
		466	case SDL_MOUSEMOTION:
		467	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
		468	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
		469	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
		470	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
		471	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
		472	break;
		473
		474	case SDL_MOUSEBUTTONDOWN:
		475	case SDL_MOUSEBUTTONUP:
		476	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
		477	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
		478	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
		479	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		480	}
		481
		482	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
		483	}
		484	}
		485
		486	int
		487	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		488	POSTCALL:
		489	Mix_HookMusicFinished (music_finished);
		490
		491	void
		492	Mix_CloseAudio ()
		493
		494	int
		495	Mix_AllocateChannels (int numchans = -1)
410		496
411	void	497	void
412	lowdelay (int fd, int val = 1)	498	lowdelay (int fd, int val = 1)
413	CODE:	499	CODE:
414	#ifndef _WIN32	500	#ifndef _WIN32
…		…
869	cell->darkness = -1;	955	cell->darkness = -1;
870	}	956	}
871	}	957	}
872		958
873	SV *	959	SV *
874	mapmap (CFClient::Map self, int w, int h)	960	mapmap (CFClient::Map self, int x0, int y0, int w, int h)
875	CODE:	961	CODE:
876	{	962	{
877	int x0, x1, x;	963	int x1, x;
878	int y0, y1, y;	964	int y1, y;
879	int z;	965	int z;
880	SV map_sv = newSV (w h * sizeof (uint32_t));	966	SV map_sv = newSV (w h * sizeof (uint32_t));
881	uint32_t map = (uint32_t )SvPVX (map_sv);	967	uint32_t map = (uint32_t )SvPVX (map_sv);
882		968
883	SvPOK_only (map_sv);	969	SvPOK_only (map_sv);
884	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	970	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
885		971
886	x0 = self->x - w / 2; x1 = x0 + w;	972	x0 += self->x; x1 = x0 + w;
887	y0 = self->y - h / 2; y1 = y0 + h;	973	y0 += self->y; y1 = y0 + h;
888		974
889	for (y = y0; y < y1; y++)	975	for (y = y0; y < y1; y++)
890	{	976	{
891	maprow *row = 0 <= y && y < self->rows	977	maprow *row = 0 <= y && y < self->rows
892	? self->row + y	978	? self->row + y
…		…
1032	data++ = 0; / version 0 format */	1118	data++ = 0; / version 0 format */
1033	data++ = w >> 8; data++ = w;	1119	data++ = w >> 8; data++ = w;
1034	data++ = h >> 8; data++ = h;	1120	data++ = h >> 8; data++ = h;
1035		1121
1036	// we need to do this 'cause we don't keep an absolute coord system for rows	1122	// we need to do this 'cause we don't keep an absolute coord system for rows
1037	// TODO: treat rows as we treat	1123	// TODO: treat rows as we treat columns
1038	map_get_row (self, y0 + self->y - self->oy);//D	1124	map_get_row (self, y0 + self->y - self->oy);//D
1039	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1125	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1040		1126
1041	x0 += self->x - self->ox;	1127	x0 += self->x - self->ox;
1042	y0 += self->y - self->oy;	1128	y0 += self->y - self->oy;
…		…
1106		1192
1107	w = data++ << 8; w \|= data++;	1193	w = data++ << 8; w \|= data++;
1108	h = data++ << 8; h \|= data++;	1194	h = data++ << 8; h \|= data++;
1109		1195
1110	// we need to do this 'cause we don't keep an absolute coord system for rows	1196	// we need to do this 'cause we don't keep an absolute coord system for rows
1111	// TODO: treat rows as we treat	1197	// TODO: treat rows as we treat columns
1112	map_get_row (self, y0 + self->y - self->oy);//D	1198	map_get_row (self, y0 + self->y - self->oy);//D
1113	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1199	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1114		1200
1115	x0 += self->x - self->ox;	1201	x0 += self->x - self->ox;
1116	y0 += self->y - self->oy;	1202	y0 += self->y - self->oy;
…		…
1151	}	1237	}
1152	}	1238	}
1153	}	1239	}
1154	}	1240	}
1155		1241
		1242	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1243
		1244	CFClient::MixChunk
		1245	new_from_file (SV class, char path)
		1246	CODE:
		1247	RETVAL = Mix_LoadWAV (path);
		1248	OUTPUT:
		1249	RETVAL
		1250
		1251	void
		1252	DESTROY (CFClient::MixChunk self)
		1253	CODE:
		1254	Mix_FreeChunk (self);
		1255
		1256	int
		1257	volume (CFClient::MixChunk self, int volume = -1)
		1258	CODE:
		1259	RETVAL = Mix_VolumeChunk (self, volume);
		1260	OUTPUT:
		1261	RETVAL
		1262
		1263	int
		1264	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1265	CODE:
		1266	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1267	OUTPUT:
		1268	RETVAL
		1269
		1270	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1271
		1272	int
		1273	volume (int volume = -1)
		1274	CODE:
		1275	RETVAL = Mix_VolumeMusic (volume);
		1276	OUTPUT:
		1277	RETVAL
		1278
		1279	CFClient::MixMusic
		1280	new_from_file (SV class, char path)
		1281	CODE:
		1282	RETVAL = Mix_LoadMUS (path);
		1283	OUTPUT:
		1284	RETVAL
		1285
		1286	void
		1287	DESTROY (CFClient::MixMusic self)
		1288	CODE:
		1289	Mix_FreeMusic (self);
		1290
		1291	int
		1292	play (CFClient::MixMusic self, int loops = -1)
		1293	CODE:
		1294	RETVAL = Mix_PlayMusic (self, loops);
		1295	OUTPUT:
		1296	RETVAL
		1297
		1298	MODULE = CFClient PACKAGE = CFClient::OpenGL
		1299
		1300	BOOT:
		1301	{
		1302	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
		1303	static const struct {
		1304	const char *name;
		1305	IV iv;
		1306	} *civ, const_iv[] = {
		1307	# define const_iv(name) { # name, (IV)name }
		1308	const_iv (GL_COLOR_MATERIAL),
		1309	const_iv (GL_SMOOTH),
		1310	const_iv (GL_FLAT),
		1311	const_iv (GL_BLEND),
		1312	const_iv (GL_AND),
		1313	const_iv (GL_SRC_ALPHA),
		1314	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1315	const_iv (GL_RGB),
		1316	const_iv (GL_RGBA),
		1317	const_iv (GL_UNSIGNED_BYTE),
		1318	const_iv (GL_ALPHA4),
		1319	const_iv (GL_ALPHA),
		1320	const_iv (GL_FLOAT),
		1321	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1322	const_iv (GL_COMPILE),
		1323	const_iv (GL_TEXTURE_1D),
		1324	const_iv (GL_TEXTURE_2D),
		1325	const_iv (GL_TEXTURE_ENV),
		1326	const_iv (GL_TEXTURE_MAG_FILTER),
		1327	const_iv (GL_TEXTURE_MIN_FILTER),
		1328	const_iv (GL_TEXTURE_ENV_MODE),
		1329	const_iv (GL_TEXTURE_WRAP_S),
		1330	const_iv (GL_TEXTURE_WRAP_T),
		1331	const_iv (GL_CLAMP),
		1332	const_iv (GL_REPEAT),
		1333	const_iv (GL_NEAREST),
		1334	const_iv (GL_LINEAR),
		1335	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1336	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1337	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1338	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1339	const_iv (GL_GENERATE_MIPMAP),
		1340	const_iv (GL_LINEAR),
		1341	const_iv (GL_MODULATE),
		1342	const_iv (GL_REPLACE),
		1343	const_iv (GL_COLOR_BUFFER_BIT),
		1344	const_iv (GL_PROJECTION),
		1345	const_iv (GL_MODELVIEW),
		1346	const_iv (GL_COLOR_LOGIC_OP),
		1347	const_iv (GL_CONVOLUTION_2D),
		1348	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1349	const_iv (GL_CONSTANT_BORDER),
		1350	const_iv (GL_LINES),
		1351	const_iv (GL_QUADS),
		1352	const_iv (GL_LINE_LOOP),
		1353	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		1354	const_iv (GL_FASTEST),
		1355	# undef const_iv
		1356	};
		1357
		1358	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1359	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1360	}
		1361
		1362	int glGetError ()
		1363
		1364	void glClear (int mask)
		1365
		1366	void glClearColor (float r, float g, float b, float a = 1.0)
		1367	PROTOTYPE: @
		1368
		1369	void glEnable (int cap)
		1370
		1371	void glDisable (int cap)
		1372
		1373	void glShadeModel (int mode)
		1374
		1375	void glHint (int target, int mode)
		1376
		1377	void glBlendFunc (int sfactor, int dfactor)
		1378
		1379	void glLogicOp (int opcode)
		1380
		1381	void glMatrixMode (int mode)
		1382
		1383	void glPushMatrix ()
		1384
		1385	void glPopMatrix ()
		1386
		1387	void glLoadIdentity ()
		1388
		1389	void glOrtho (double left, double right, double bottom, double top, double near, double far)
		1390
		1391	void glViewport (int x, int y, int width, int height)
		1392
		1393	void glTranslate (float x, float y, float z = 0.)
		1394	CODE:
		1395	glTranslatef (x, y, z);
		1396
		1397	void glScale (float x, float y, float z)
		1398	CODE:
		1399	glScalef (x, y, z);
		1400
		1401	void glRotate (float angle, float x, float y, float z)
		1402	CODE:
		1403	glRotatef (angle, x, y, z);
		1404
		1405	void glBegin (int mode)
		1406
		1407	void glEnd ()
		1408
		1409	void glColor (float r, float g, float b, float a = 1.0)
		1410	PROTOTYPE: @
		1411	CODE:
		1412	glColor4f (r, g, b, a);
		1413
		1414	void glVertex (float x, float y, float z = 0.)
		1415	CODE:
		1416	glVertex3f (x, y, z);
		1417
		1418	void glTexCoord (float s, float t)
		1419	CODE:
		1420	glTexCoord2f (s, t);
		1421
		1422	void glTexEnv (int target, int pname, float param)
		1423	CODE:
		1424	glTexEnvf (target, pname, param);
		1425
		1426	void glTexParameter (int target, int pname, float param)
		1427	CODE:
		1428	glTexParameterf (target, pname, param);
		1429
		1430	void glBindTexture (int target, int name)
		1431
		1432	void glConvolutionParameter (int target, int pname, float params)
		1433	CODE:
		1434	glConvolutionParameterf (target, pname, params);
		1435
		1436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1437
		1438	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		1439
		1440	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1441
		1442	int glGenTexture ()
		1443	CODE:
		1444	{
		1445	GLuint name;
		1446	glGenTextures (1, &name);
		1447	RETVAL = name;
		1448	}
		1449	OUTPUT:
		1450	RETVAL
		1451
		1452	void glDeleteTexture (int name)
		1453	CODE:
		1454	{
		1455	GLuint name_ = name;
		1456	glDeleteTextures (1, &name_);
		1457	}
		1458
		1459	int glGenList ()
		1460	CODE:
		1461	RETVAL = glGenLists (1);
		1462	OUTPUT:
		1463	RETVAL
		1464
		1465	void glDeleteList (int list)
		1466	CODE:
		1467	glDeleteLists (list, 1);
		1468
		1469	void glNewList (int list, int mode = GL_COMPILE)
		1470
		1471	void glEndList ()
		1472
		1473	void glCallList (int list)
		1474

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.58 by root, Sun Apr 23 00:57:38 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.58 by root, Sun Apr 23 00:57:38 2006 UTC