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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC

… …
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
… …
299 ev.code = 1; 300 ev.code = 1;
300 ev.data1 = (void *)(long)channel; 301 ev.data1 = (void *)(long)channel;
301 ev.data2 = 0; 302 ev.data2 = 0;
302 303
303 SDL_PushEvent ((SDL_Event *)&ev); 304 SDL_PushEvent ((SDL_Event *)&ev);
305}
306
307static unsigned int
308minpot (unsigned int n)
309{
310 if (!n)
311 return 0;
312
313 --n;
314
315 n |= n >> 1;
316 n |= n >> 2;
317 n |= n >> 4;
318 n |= n >> 8;
319 n |= n >> 16;
320
321 return n + 1;
304} 322}
305 323
306MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
307 325
308PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
… …
418 436
419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421} 439}
422 440
441NV floor (NV x)
442
443NV ceil (NV x)
444
423void 445void
424pango_init () 446pango_init ()
425 CODE: 447 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx 448 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 449{
… …
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 488
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 491
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
703 CODE: 725 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 726 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 727#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 729#endif
708 exit (1); 730 _exit (1);
731
732void
733_exit (int retval)
734 CODE:
735 _exit (retval);
709 736
710MODULE = CFClient PACKAGE = CFClient::Font 737MODULE = CFClient PACKAGE = CFClient::Font
711 738
712CFClient::Font 739CFClient::Font
713new_from_file (SV *class, char *path, int id = 0) 740new_from_file (SV *class, char *path, int id = 0)
… …
978} 1005}
979 1006
980MODULE = CFClient PACKAGE = CFClient::Texture 1007MODULE = CFClient PACKAGE = CFClient::Texture
981 1008
982void 1009void
1010pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE:
1012{
1013 int ow = SvIV (w_);
1014 int oh = SvIV (h_);
1015
1016 if (ow && oh)
1017 {
1018 int nw = minpot (ow);
1019 int nh = minpot (oh);
1020
1021 if (nw != ow || nh != oh)
1022 {
1023 if (SvOK (data_))
1024 {
1025 STRLEN datalen;
1026 char *data = SvPVbyte (data_, datalen);
1027 int bpp = datalen / (ow * oh);
1028 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1029
1030 SvPOK_only (result_);
1031 SvCUR_set (result_, nw * nh * bpp);
1032
1033 memset (SvPVX (result_), 0, nw * nh * bpp);
1034 while (oh--)
1035 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1036
1037 sv_setsv (data_, result_);
1038 }
1039
1040 sv_setiv (w_, nw);
1041 sv_setiv (h_, nh);
1042 }
1043 }
1044}
1045
1046void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1047draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1048 PROTOTYPE: $$$;$$
985 ALIAS: 1049 ALIAS:
986 draw_quad_alpha = 1 1050 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1051 draw_quad_alpha_premultiplied = 2
988 CODE: 1052 CODE:
… …
1053DESTROY (CFClient::Map self) 1117DESTROY (CFClient::Map self)
1054 CODE: 1118 CODE:
1055{ 1119{
1056 map_clear (self); 1120 map_clear (self);
1057 Safefree (self->face); 1121 Safefree (self->face);
1122 Safefree (self->tex);
1058 Safefree (self); 1123 Safefree (self);
1059} 1124}
1060 1125
1061void 1126void
1062clear (CFClient::Map self) 1127clear (CFClient::Map self)
… …
1168 1233
1169 while (data < data_end) 1234 while (data < data_end)
1170 { 1235 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1236 flags = (data [0] << 8) + data [1]; data += 2;
1172 1237
1173 x = ((flags >> 10) & 63) + self->x; 1238 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1239 y = self->y + ((flags >> 4) & 63);
1175 1240
1176 cell = map_get_cell (self, x, y); 1241 cell = map_get_cell (self, x, y);
1177 1242
1178 if (flags & 15) 1243 if (flags & 15)
1179 { 1244 {
… …
1269 OUTPUT: 1334 OUTPUT:
1270 RETVAL 1335 RETVAL
1271 1336
1272void 1337void
1273draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274 PPCODE: 1339 CODE:
1275{ 1340{
1276 int vx, vy; 1341 int vx, vy;
1277 int x, y, z; 1342 int x, y, z;
1278 int last_name; 1343 int last_name;
1279 mapface face; 1344 mapface face;
1280 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1345
1284 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh);
1287
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1346 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1347 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290 1348
1291 /* 1349 /*
1292 int vx = self->vx = self->w >= sw 1350 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2 1351 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
… …
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1356 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */ 1357 */
1300 1358
1301 glColor4ub (255, 255, 255, 255); 1359 glColor4ub (255, 255, 255, 255);
1302 1360
1361 glEnable (GL_BLEND);
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1362 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D); 1363 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1364 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307 1365
1308 glBegin (GL_QUADS); 1366 glBegin (GL_QUADS);
1309 1367
… …
1317 1375
1318 for (x = 0; x < sw; x++) 1376 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1377 if (row->c0 <= x + vx && x + vx < row->c1)
1320 { 1378 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1379 mapcell *cell = row->col + (x + vx - row->c0);
1322
1323 darkness[y * sw4 + x] = cell->darkness < 0
1324 ? 255 - FOW_DARKNESS
1325 : 255 - cell->darkness;
1326 1380
1327 face = cell->face [z]; 1381 face = cell->face [z];
1328 1382
1329 if (face) 1383 if (face)
1330 { 1384 {
… …
1351 1405
1352 glEnd (); 1406 glEnd ();
1353 1407
1354 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND); 1409 glDisable (GL_BLEND);
1410}
1411
1412void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE:
1415{
1416 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 },
1418 { 1.00, 1.00, 1.00 },
1419 { 0.00, 0.00, 0.55 },
1420 { 1.00, 0.00, 0.00 },
1421
1422 { 1.00, 0.54, 0.00 },
1423 { 0.11, 0.56, 1.00 },
1424 { 0.93, 0.46, 0.00 },
1425 { 0.18, 0.54, 0.34 },
1426
1427 { 0.56, 0.73, 0.56 },
1428 { 0.80, 0.80, 0.80 },
1429 { 0.55, 0.41, 0.13 },
1430 { 0.99, 0.77, 0.26 },
1431
1432 { 0.74, 0.65, 0.41 },
1433
1434 { 0.00, 1.00, 1.00 },
1435 { 1.00, 0.00, 1.00 },
1436 { 1.00, 1.00, 0.00 },
1437 };
1438
1439 int x, y;
1440
1441 glEnable (GL_TEXTURE_2D);
1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1443 glEnable (GL_BLEND);
1444 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1445 glBegin (GL_QUADS);
1446
1447 for (y = 0; y < h; y++)
1448 for (x = 0; x < w; x++)
1449 {
1450 unsigned char m = data [x + y * w];
1451
1452 if (m)
1453 {
1454 float *c = color [m & 15];
1455
1456 float tx1 = m & 0x40 ? 0.5 : 0.;
1457 float tx2 = tx1 + 0.5;
1458
1459 glColor4f (c[0], c[1], c[2], 0.75);
1460 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1461 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1462 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1463 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1464 }
1465 }
1466
1467 glEnd ();
1468 glDisable (GL_BLEND);
1469 glDisable (GL_TEXTURE_2D);
1470}
1471
1472void
1473fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474 PPCODE:
1475{
1476 int vx, vy;
1477 int x, y;
1478 int sw4 = (sw + 3) & ~3;
1479 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1480 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1481
1482 memset (darkness, 255, sw4 * sh);
1483 SvPOK_only (darkness_sv);
1484 SvCUR_set (darkness_sv, sw4 * sh);
1485
1486 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1487 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1488
1489 for (y = 0; y < sh; y++)
1490 if (0 <= y + vy && y + vy < self->rows)
1491 {
1492 maprow *row = self->row + (y + vy);
1493
1494 for (x = 0; x < sw; x++)
1495 if (row->c0 <= x + vx && x + vx < row->c1)
1496 {
1497 mapcell *cell = row->col + (x + vx - row->c0);
1498
1499 darkness[y * sw4 + x] = cell->darkness < 0
1500 ? 255 - FOW_DARKNESS
1501 : 255 - cell->darkness;
1502 }
1503 }
1356 1504
1357 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1506 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1507 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1508 PUSHs (darkness_sv);
… …
1567 const_iv (GL_SCISSOR_TEST), 1715 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 1716 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 1717 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 1718 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 1719 const_iv (GL_RESCALE_NORMAL),
1720 const_iv (GL_FRONT),
1721 const_iv (GL_BACK),
1572 const_iv (GL_AND), 1722 const_iv (GL_AND),
1573 const_iv (GL_ONE), 1723 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 1724 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 1725 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 1726 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1727 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 1728 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1729 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 1730 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 1731 const_iv (GL_RGBA),
1732 const_iv (GL_RGBA4),
1733 const_iv (GL_RGBA8),
1734 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 1735 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 1736 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 1737 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 1738 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 1739 const_iv (GL_INTENSITY),
… …
1660 OUTPUT: 1813 OUTPUT:
1661 RETVAL 1814 RETVAL
1662 1815
1663int glGetError () 1816int glGetError ()
1664 1817
1818void glFinish ()
1819
1665void glClear (int mask) 1820void glClear (int mask)
1666 1821
1667void glClearColor (float r, float g, float b, float a = 1.0) 1822void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 1823 PROTOTYPE: @
1669 1824
… …
1692void glPushMatrix () 1847void glPushMatrix ()
1693 1848
1694void glPopMatrix () 1849void glPopMatrix ()
1695 1850
1696void glLoadIdentity () 1851void glLoadIdentity ()
1852
1853void glDrawBuffer (int buffer)
1854
1855void glReadBuffer (int buffer)
1697 1856
1698# near_ and far_ are due to microsofts buggy "c" compiler 1857# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1858void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 1859
1701# near_ and far_ are due to microsofts buggy "c" compiler 1860# near_ and far_ are due to microsofts buggy "c" compiler

Diff Legend

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