ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC

… …
40#define FOW_DARKNESS 32 40#define FOW_DARKNESS 32
41 41
42#define MAP_EXTEND_X 32 42#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 43#define MAP_EXTEND_Y 512
44 44
45#define MIN_FONT_HEIGHT 8 45#define MIN_FONT_HEIGHT 10
46
47#define GL_CALL(type,func,args) \
48 { \
49 static int init_; \
50 static type fptr_; \
51 \
52 if (!init_) \
53 { \
54 init_ = 1; \
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56 } \
57 \
58 if (fptr_) \
59 fptr_ args; \
60 }
46 61
47typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
49 64
50typedef PangoFontDescription *CFClient__Font; 65typedef PangoFontDescription *CFClient__Font;
… …
1331 const_iv (GL_SRC_ALPHA), 1346 const_iv (GL_SRC_ALPHA),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1347 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1333 const_iv (GL_RGB), 1348 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1349 const_iv (GL_RGBA),
1335 const_iv (GL_UNSIGNED_BYTE), 1350 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4),
1337 const_iv (GL_ALPHA), 1351 const_iv (GL_ALPHA),
1338 const_iv (GL_FLOAT), 1352 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1353 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1354 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1355 const_iv (GL_TEXTURE_1D),
… …
1402 1416
1403void glPopMatrix () 1417void glPopMatrix ()
1404 1418
1405void glLoadIdentity () 1419void glLoadIdentity ()
1406 1420
1421# near and far are due to microsofts buggy c compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 1422void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 1423
1409void glViewport (int x, int y, int width, int height) 1424void glViewport (int x, int y, int width, int height)
1410 1425
1411void glTranslate (float x, float y, float z = 0.) 1426void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1427 CODE:
1413 glTranslatef (x, y, z); 1428 glTranslatef (x, y, z);
1414 1429
1415void glScale (float x, float y, float z) 1430void glScale (float x, float y, float z = 1.)
1416 CODE: 1431 CODE:
1417 glScalef (x, y, z); 1432 glScalef (x, y, z);
1418 1433
1419void glRotate (float angle, float x, float y, float z) 1434void glRotate (float angle, float x, float y, float z)
1420 CODE: 1435 CODE:
… …
1447 1462
1448void glBindTexture (int target, int name) 1463void glBindTexture (int target, int name)
1449 1464
1450void glConvolutionParameter (int target, int pname, float params) 1465void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1466 CODE:
1452 glConvolutionParameterf (target, pname, params); 1467 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453 1468
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1469void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470 CODE:
1471 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472 (target, internalformat, width, height, format, type, data));
1455 1473
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1474void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 1475
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1476void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1459 1477

Diff Legend

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