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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC

… …
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 455
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456 457
457 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 460
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
469 470
470 ++m; 471 ++m;
471 } 472 }
472} 473}
473 474
475char *
476SDL_GetError ()
477
474int 478int
475SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 480 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
478 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
481 OUTPUT: 485 OUTPUT:
482 RETVAL 486 RETVAL
483 487
484void 488void
485SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
486 493
487void 494void
488SDL_PollEvent () 495SDL_PollEvent ()
489 PPCODE: 496 PPCODE:
490{ 497{
… …
509 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511 break; 518 break;
512 519
513 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
514 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519 break; 528 break;
520 529
521 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
522 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break; 538 break;
… …
553lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
554 CODE: 565 CODE:
555#ifndef _WIN32 566#ifndef _WIN32
556 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557#endif 568#endif
558
559char *
560gl_version ()
561 CODE:
562 RETVAL = (char *)glGetString (GL_VERSION);
563 OUTPUT:
564 RETVAL
565
566char *
567gl_extensions ()
568 CODE:
569 RETVAL = (char *)glGetString (GL_EXTENSIONS);
570 OUTPUT:
571 RETVAL
572 569
573void 570void
574add_font (char *file) 571add_font (char *file)
575 CODE: 572 CODE:
576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
669} 666}
670 667
671void 668void
672error (char *message) 669error (char *message)
673 CODE: 670 CODE:
671 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 672#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 674#endif
679 675
680void 676void
681fatal (char *message) 677fatal (char *message)
682 CODE: 678 CODE:
679 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 680#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 682#endif
688 exit (1); 683 exit (1);
689 684
690MODULE = CFClient PACKAGE = CFClient::Font 685MODULE = CFClient PACKAGE = CFClient::Font
691 686
… …
714MODULE = CFClient PACKAGE = CFClient::Layout 709MODULE = CFClient PACKAGE = CFClient::Layout
715 710
716CFClient::Layout 711CFClient::Layout
717new (SV *class, int rgba = 0) 712new (SV *class, int rgba = 0)
718 CODE: 713 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
719 New (0, RETVAL, 1, struct cf_layout); 717 New (0, RETVAL, 1, struct cf_layout);
720 718
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba; 720 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 721 RETVAL->r = 1.;
… …
903 901
904 while (p < e) 902 while (p < e)
905 { 903 {
906 uint32_t rgba = *p; 904 uint32_t rgba = *p;
907 rgba = (rgba >> 24) | (rgba << 8); 905 rgba = (rgba >> 24) | (rgba << 8);
906#if 0
907#ifdef _WIN32
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913
914 rgba = (rgba & 0xffffff00) | a;
915 }
916#endif
917#endif
908 rgba = SDL_SwapBE32 (rgba); 918 rgba = SDL_SwapBE32 (rgba);
909 *p++ = rgba; 919 *p++ = rgba;
910 } 920 }
911 } 921 }
912 922
… …
969 979
970 if (ix) 980 if (ix)
971 { 981 {
972 glEnable (GL_BLEND); 982 glEnable (GL_BLEND);
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 983 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
984 glEnable (GL_ALPHA_TEST);
985 glAlphaFunc (GL_GREATER, 0.01f);
974 } 986 }
975 987
976 glBindTexture (GL_TEXTURE_2D, name); 988 glBindTexture (GL_TEXTURE_2D, name);
977 989
978 if (wrap_mode) 990 if (wrap_mode)
… …
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 999 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1000 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1001 glEnd ();
990 1002
991 if (ix) 1003 if (ix)
1004 {
1005 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1006 glDisable (GL_BLEND);
1007 }
993} 1008}
994 1009
995MODULE = CFClient PACKAGE = CFClient::Map 1010MODULE = CFClient PACKAGE = CFClient::Map
996 1011
997CFClient::Map 1012CFClient::Map
… …
1061 tex->r = r; 1076 tex->r = r;
1062 tex->g = g; 1077 tex->g = g;
1063 tex->b = b; 1078 tex->b = b;
1064 tex->a = a; 1079 tex->a = a;
1065 } 1080 }
1081
1082 // somewhat hackish, but for textures that require it, it really
1083 // improves the look, and most others don't suffer.
1084 glBindTexture (GL_TEXTURE_2D, name);
1085 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1086 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1066} 1087}
1067 1088
1068int 1089int
1069ox (CFClient::Map self) 1090ox (CFClient::Map self)
1070 ALIAS: 1091 ALIAS:
… …
1508 const_iv (GL_COLOR_MATERIAL), 1529 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1530 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1531 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1532 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1533 const_iv (GL_BLEND),
1534 const_iv (GL_CULL_FACE),
1513 const_iv (GL_SCISSOR_TEST), 1535 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL),
1514 const_iv (GL_AND), 1540 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1541 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1542 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1543 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1544 const_iv (GL_SRC_ALPHA_SATURATE),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1545 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1546 const_iv (GL_ONE_MINUS_DST_ALPHA),
1521 const_iv (GL_RGB), 1547 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1548 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1549 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1552 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1554 const_iv (GL_LUMINANCE),
1555 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1556 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1557 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1558 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1559 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1560 const_iv (GL_TEXTURE_2D),
… …
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1574 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1575 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1576 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1577 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1578 const_iv (GL_REPLACE),
1579 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1580 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1581 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1582 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1583 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1584 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1585 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1586 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1587 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1588 const_iv (GL_LINES),
1589 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1590 const_iv (GL_QUADS),
1559 const_iv (GL_LINE_LOOP), 1591 const_iv (GL_QUAD_STRIP),
1592 const_iv (GL_TRIANGLES),
1593 const_iv (GL_TRIANGLE_STRIP),
1594 const_iv (GL_TRIANGLE_FAN),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1595 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 const_iv (GL_FASTEST), 1596 const_iv (GL_FASTEST),
1597 const_iv (GL_V2F),
1598 const_iv (GL_V3F),
1599 const_iv (GL_T2F_V3F),
1600 const_iv (GL_T2F_N3F_V3F),
1562# undef const_iv 1601# undef const_iv
1563 }; 1602 };
1564 1603
1565 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1604 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1605 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567} 1606}
1568 1607
1608char *
1609gl_vendor ()
1610 CODE:
1611 RETVAL = (char *)glGetString (GL_VENDOR);
1612 OUTPUT:
1613 RETVAL
1614
1615char *
1616gl_version ()
1617 CODE:
1618 RETVAL = (char *)glGetString (GL_VERSION);
1619 OUTPUT:
1620 RETVAL
1621
1622char *
1623gl_extensions ()
1624 CODE:
1625 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1626 OUTPUT:
1627 RETVAL
1628
1569int glGetError () 1629int glGetError ()
1570 1630
1571void glClear (int mask) 1631void glClear (int mask)
1572 1632
1573void glClearColor (float r, float g, float b, float a = 1.0) 1633void glClearColor (float r, float g, float b, float a = 1.0)
… …
1581 1641
1582void glHint (int target, int mode) 1642void glHint (int target, int mode)
1583 1643
1584void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1585 1645
1646void glDepthMask (int flag)
1647
1586void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1587 1649
1588void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1589 1651
1590void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
… …
1593 1655
1594void glPopMatrix () 1656void glPopMatrix ()
1595 1657
1596void glLoadIdentity () 1658void glLoadIdentity ()
1597 1659
1598# near and far are due to microsofts buggy c compiler 1660# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662
1663# near_ and far_ are due to microsofts buggy "c" compiler
1599void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1664void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600 1665
1601void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1602 1667
1603void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
… …
1619void glEnd () 1684void glEnd ()
1620 1685
1621void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1622 PROTOTYPE: @ 1687 PROTOTYPE: @
1623 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1624 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1625 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1626 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1627 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1628 1694
1695void glInterleavedArrays (int format, int stride, char *data)
1696
1697void glDrawElements (int mode, int count, int type, char *indices)
1698
1699# 1.2 void glDrawRangeElements (int mode, int start, int end
1700
1701void glRasterPos (float x, float y, float z = 0.)
1702 CODE:
1703 glRasterPos3f (0, 0, z);
1704 glBitmap (0, 0, 0, 0, x, y, 0);
1705
1629void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1630 CODE: 1707 CODE:
1631 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1632 1709
1633void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
… …
1660 1737
1661void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662 1739
1663void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664 1741
1665void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666 CODE:
1667 glRasterPos2i (x, y);
1668 1743
1669void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670 1745
1671int glGenTexture () 1746int glGenTexture ()
1672 CODE: 1747 CODE:
… …
1699 1774
1700void glEndList () 1775void glEndList ()
1701 1776
1702void glCallList (int list) 1777void glCallList (int list)
1703 1778
1779

Diff Legend

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