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.95 by root, Wed May 24 01:46:53 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
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
558 576
559char * 577char *
560gl_version () 578gl_version ()
561 CODE: 579 CODE:
562 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
… …
669} 687}
670 688
671void 689void
672error (char *message) 690error (char *message)
673 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 693#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 695#endif
679 696
680void 697void
681fatal (char *message) 698fatal (char *message)
682 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 701#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 703#endif
688 exit (1); 704 exit (1);
689 705
690MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
691 707
… …
714MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
715 731
716CFClient::Layout 732CFClient::Layout
717new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
718 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
719 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
720 739
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 742 RETVAL->r = 1.;
… …
903 922
904 while (p < e) 923 while (p < e)
905 { 924 {
906 uint32_t rgba = *p; 925 uint32_t rgba = *p;
907 rgba = (rgba >> 24) | (rgba << 8); 926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
908 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
909 *p++ = rgba; 940 *p++ = rgba;
910 } 941 }
911 } 942 }
912 943
… …
969 1000
970 if (ix) 1001 if (ix)
971 { 1002 {
972 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f);
974 } 1007 }
975 1008
976 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
977 1010
978 if (wrap_mode) 1011 if (wrap_mode)
… …
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1022 glEnd ();
990 1023
991 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
993} 1029}
994 1030
995MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
996 1032
997CFClient::Map 1033CFClient::Map
… …
1061 tex->r = r; 1097 tex->r = r;
1062 tex->g = g; 1098 tex->g = g;
1063 tex->b = b; 1099 tex->b = b;
1064 tex->a = a; 1100 tex->a = a;
1065 } 1101 }
1102
1103 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1066} 1108}
1067 1109
1068int 1110int
1069ox (CFClient::Map self) 1111ox (CFClient::Map self)
1070 ALIAS: 1112 ALIAS:
… …
1508 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1553 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1513 const_iv (GL_SCISSOR_TEST), 1556 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL),
1514 const_iv (GL_AND), 1561 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1562 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1563 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1565 const_iv (GL_SRC_ALPHA_SATURATE),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1521 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1523 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1575 const_iv (GL_LUMINANCE),
1576 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1578 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1579 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1580 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1581 const_iv (GL_TEXTURE_2D),
… …
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1559 const_iv (GL_LINE_LOOP), 1612 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP),
1615 const_iv (GL_TRIANGLE_FAN),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 const_iv (GL_FASTEST), 1617 const_iv (GL_FASTEST),
1618 const_iv (GL_V2F),
1619 const_iv (GL_V3F),
1620 const_iv (GL_T2F_V3F),
1621 const_iv (GL_T2F_N3F_V3F),
1562# undef const_iv 1622# undef const_iv
1563 }; 1623 };
1564 1624
1565 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
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