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.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

… …
300 ev.code = 1; 300 ev.code = 1;
301 ev.data1 = (void *)(long)channel; 301 ev.data1 = (void *)(long)channel;
302 ev.data2 = 0; 302 ev.data2 = 0;
303 303
304 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;
305} 322}
306 323
307MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
308 325
309PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
… …
419 436
420 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; )
421 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422} 439}
423 440
441NV floor (NV x)
442
443NV ceil (NV x)
444
424void 445void
425pango_init () 446pango_init ()
426 CODE: 447 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx 448 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 449{
… …
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 488
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 491
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
704 CODE: 725 CODE:
705 fprintf (stderr, "FATAL: %s\n", message); 726 fprintf (stderr, "FATAL: %s\n", message);
706#ifdef _WIN32 727#ifdef _WIN32
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 729#endif
709 _Exit (1); 730 _exit (1);
710 731
711void 732void
712_exit (int retval) 733_exit (int retval)
713 CODE: 734 CODE:
714 _Exit (retval); 735 _exit (retval);
715 736
716MODULE = CFClient PACKAGE = CFClient::Font 737MODULE = CFClient PACKAGE = CFClient::Font
717 738
718CFClient::Font 739CFClient::Font
719new_from_file (SV *class, char *path, int id = 0) 740new_from_file (SV *class, char *path, int id = 0)
… …
984} 1005}
985 1006
986MODULE = CFClient PACKAGE = CFClient::Texture 1007MODULE = CFClient PACKAGE = CFClient::Texture
987 1008
988void 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
989draw_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.)
990 PROTOTYPE: $$$;$$ 1048 PROTOTYPE: $$$;$$
991 ALIAS: 1049 ALIAS:
992 draw_quad_alpha = 1 1050 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1051 draw_quad_alpha_premultiplied = 2
994 CODE: 1052 CODE:
… …
1276 OUTPUT: 1334 OUTPUT:
1277 RETVAL 1335 RETVAL
1278 1336
1279void 1337void
1280draw (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)
1281 PPCODE: 1339 CODE:
1282{ 1340{
1283 int vx, vy; 1341 int vx, vy;
1284 int x, y, z; 1342 int x, y, z;
1285 int last_name; 1343 int last_name;
1286 mapface face; 1344 mapface face;
1287 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290 1345
1291 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh);
1294
1295 vx = self->x + (self->w - sw) / 2 - shift_x; 1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1297 1348
1298 /* 1349 /*
1299 int vx = self->vx = self->w >= sw 1350 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2 1351 ? self->x + (self->w - sw) / 2
1301 : 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));
… …
1324 1375
1325 for (x = 0; x < sw; x++) 1376 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1377 if (row->c0 <= x + vx && x + vx < row->c1)
1327 { 1378 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1379 mapcell *cell = row->col + (x + vx - row->c0);
1329
1330 darkness[y * sw4 + x] = cell->darkness < 0
1331 ? 255 - FOW_DARKNESS
1332 : 255 - cell->darkness;
1333 1380
1334 face = cell->face [z]; 1381 face = cell->face [z];
1335 1382
1336 if (face) 1383 if (face)
1337 { 1384 {
… …
1358 1405
1359 glEnd (); 1406 glEnd ();
1360 1407
1361 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1362 glDisable (GL_BLEND); 1409 glDisable (GL_BLEND);
1410}
1411
1412void
1413fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1414 PPCODE:
1415{
1416 int vx, vy;
1417 int x, y;
1418 int sw4 = (sw + 3) & ~3;
1419 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1420 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1421
1422 memset (darkness, 255, sw4 * sh);
1423 SvPOK_only (darkness_sv);
1424 SvCUR_set (darkness_sv, sw4 * sh);
1425
1426 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1427 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1428
1429 for (y = 0; y < sh; y++)
1430 if (0 <= y + vy && y + vy < self->rows)
1431 {
1432 maprow *row = self->row + (y + vy);
1433
1434 for (x = 0; x < sw; x++)
1435 if (row->c0 <= x + vx && x + vx < row->c1)
1436 {
1437 mapcell *cell = row->col + (x + vx - row->c0);
1438
1439 darkness[y * sw4 + x] = cell->darkness < 0
1440 ? 255 - FOW_DARKNESS
1441 : 255 - cell->darkness;
1442 }
1443 }
1363 1444
1364 EXTEND (SP, 3); 1445 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1446 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1447 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1448 PUSHs (darkness_sv);
… …
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1665 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 1666 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 1667 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 1668 const_iv (GL_RGB),
1588 const_iv (GL_RGBA), 1669 const_iv (GL_RGBA),
1670 const_iv (GL_RGBA4),
1671 const_iv (GL_RGBA8),
1672 const_iv (GL_RGB5_A1),
1589 const_iv (GL_UNSIGNED_BYTE), 1673 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 1674 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 1675 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 1676 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 1677 const_iv (GL_INTENSITY),
… …
1667 OUTPUT: 1751 OUTPUT:
1668 RETVAL 1752 RETVAL
1669 1753
1670int glGetError () 1754int glGetError ()
1671 1755
1756void glFinish ()
1757
1672void glClear (int mask) 1758void glClear (int mask)
1673 1759
1674void glClearColor (float r, float g, float b, float a = 1.0) 1760void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 1761 PROTOTYPE: @
1676 1762

Diff Legend

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