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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.118 by root, Thu Jun 15 15:47:35 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>
… …
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
86 87
87static void 88static void
88substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
89{ 90{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
95#ifdef _WIN32
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1); 96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
93} 100}
94 101
95static void 102static void
96layout_update_font (CFClient__Layout self) 103layout_update_font (CFClient__Layout self)
97{ 104{
… …
293 ev.code = 1; 300 ev.code = 1;
294 ev.data1 = (void *)(long)channel; 301 ev.data1 = (void *)(long)channel;
295 ev.data2 = 0; 302 ev.data2 = 0;
296 303
297 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;
298} 322}
299 323
300MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
301 325
302PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
… …
412 436
413 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; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415} 439}
416 440
441NV floor (NV x)
442
443NV ceil (NV x)
444
417void 445void
418pango_init () 446pango_init ()
419 CODE: 447 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx 448 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 449{
422 { 450 {
423 ft2_fontmap = pango_ft2_font_map_new (); 451 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 452 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 } 454 }
427
428 { 455 {
429 cairo_font_options_t *fopt = cairo_font_options_create (); 456 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default (); 457 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY); 463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL); 465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON); 466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt); 467 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt); 468 cairo_font_options_destroy (fopt);
437 } 469 }
… …
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 488
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 491
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
693 CODE: 725 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 726 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 727#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 729#endif
698 exit (1); 730 _exit (1);
731
732void
733_exit (int retval)
734 CODE:
735 _exit (retval);
699 736
700MODULE = CFClient PACKAGE = CFClient::Font 737MODULE = CFClient PACKAGE = CFClient::Font
701 738
702CFClient::Font 739CFClient::Font
703new_from_file (SV *class, char *path, int id = 0) 740new_from_file (SV *class, char *path, int id = 0)
… …
724MODULE = CFClient PACKAGE = CFClient::Layout 761MODULE = CFClient PACKAGE = CFClient::Layout
725 762
726CFClient::Layout 763CFClient::Layout
727new (SV *class, int rgba = 0) 764new (SV *class, int rgba = 0)
728 CODE: 765 CODE:
729#if _WIN32
730 //rgba = 0;//D makes text nicer, breaks TextView
731#endif
732 rgba=1;//D
733 New (0, RETVAL, 1, struct cf_layout); 766 New (0, RETVAL, 1, struct cf_layout);
734 767
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
736 RETVAL->rgba = rgba; 769 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 770 RETVAL->r = 1.;
… …
781 814
782SV * 815SV *
783get_text (CFClient::Layout self) 816get_text (CFClient::Layout self)
784 CODE: 817 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 819 sv_utf8_decode (RETVAL);
787 OUTPUT: 820 OUTPUT:
788 RETVAL 821 RETVAL
789 822
790void 823void
791set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
972} 1005}
973 1006
974MODULE = CFClient PACKAGE = CFClient::Texture 1007MODULE = CFClient PACKAGE = CFClient::Texture
975 1008
976void 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
977draw_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.)
978 PROTOTYPE: $$$;$$ 1048 PROTOTYPE: $$$;$$
979 ALIAS: 1049 ALIAS:
980 draw_quad_alpha = 1 1050 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1051 draw_quad_alpha_premultiplied = 2
982 CODE: 1052 CODE:
… …
1047DESTROY (CFClient::Map self) 1117DESTROY (CFClient::Map self)
1048 CODE: 1118 CODE:
1049{ 1119{
1050 map_clear (self); 1120 map_clear (self);
1051 Safefree (self->face); 1121 Safefree (self->face);
1122 Safefree (self->tex);
1052 Safefree (self); 1123 Safefree (self);
1053} 1124}
1054 1125
1055void 1126void
1056clear (CFClient::Map self) 1127clear (CFClient::Map self)
… …
1263 OUTPUT: 1334 OUTPUT:
1264 RETVAL 1335 RETVAL
1265 1336
1266void 1337void
1267draw (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)
1268 PPCODE: 1339 CODE:
1269{ 1340{
1270 int vx, vy; 1341 int vx, vy;
1271 int x, y, z; 1342 int x, y, z;
1272 int last_name; 1343 int last_name;
1273 mapface face; 1344 mapface face;
1274 int sw4 = (sw + 3) & ~3;
1275 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277 1345
1278 memset (darkness, 255, sw4 * sh);
1279 SvPOK_only (darkness_sv);
1280 SvCUR_set (darkness_sv, sw4 * sh);
1281
1282 vx = self->x + (self->w - sw) / 2 - shift_x; 1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1284 1348
1285 /* 1349 /*
1286 int vx = self->vx = self->w >= sw 1350 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2 1351 ? self->x + (self->w - sw) / 2
1288 : 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));
… …
1292 : 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));
1293 */ 1357 */
1294 1358
1295 glColor4ub (255, 255, 255, 255); 1359 glColor4ub (255, 255, 255, 255);
1296 1360
1361 glEnable (GL_BLEND);
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1362 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D); 1363 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1364 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301 1365
1302 glBegin (GL_QUADS); 1366 glBegin (GL_QUADS);
1303 1367
… …
1311 1375
1312 for (x = 0; x < sw; x++) 1376 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1377 if (row->c0 <= x + vx && x + vx < row->c1)
1314 { 1378 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1379 mapcell *cell = row->col + (x + vx - row->c0);
1316
1317 darkness[y * sw4 + x] = cell->darkness < 0
1318 ? 255 - FOW_DARKNESS
1319 : 255 - cell->darkness;
1320 1380
1321 face = cell->face [z]; 1381 face = cell->face [z];
1322 1382
1323 if (face) 1383 if (face)
1324 { 1384 {
… …
1345 1405
1346 glEnd (); 1406 glEnd ();
1347 1407
1348 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1349 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 }
1350 1504
1351 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1506 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1507 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1508 PUSHs (darkness_sv);
… …
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1725 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 1726 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 1727 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 1728 const_iv (GL_RGB),
1575 const_iv (GL_RGBA), 1729 const_iv (GL_RGBA),
1730 const_iv (GL_RGBA4),
1731 const_iv (GL_RGBA8),
1732 const_iv (GL_RGB5_A1),
1576 const_iv (GL_UNSIGNED_BYTE), 1733 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 1734 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 1735 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 1736 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 1737 const_iv (GL_INTENSITY),
… …
1654 OUTPUT: 1811 OUTPUT:
1655 RETVAL 1812 RETVAL
1656 1813
1657int glGetError () 1814int glGetError ()
1658 1815
1816void glFinish ()
1817
1659void glClear (int mask) 1818void glClear (int mask)
1660 1819
1661void glClearColor (float r, float g, float b, float a = 1.0) 1820void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 1821 PROTOTYPE: @
1663 1822

Diff Legend

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