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.88 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.95 by root, Wed May 24 01:46:53 2006 UTC

… …
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); 448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450 450
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
485 OUTPUT: 485 OUTPUT:
486 RETVAL 486 RETVAL
487 487
488void 488void
489SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
490 493
491void 494void
492SDL_PollEvent () 495SDL_PollEvent ()
493 PPCODE: 496 PPCODE:
494{ 497{
… …
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 518 break;
516 519
517 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 528 break;
524 529
525 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 538 break;
… …
557lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
558 CODE: 565 CODE:
559#ifndef _WIN32 566#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 568#endif
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
562 576
563char * 577char *
564gl_version () 578gl_version ()
565 CODE: 579 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
… …
1083 tex->r = r; 1097 tex->r = r;
1084 tex->g = g; 1098 tex->g = g;
1085 tex->b = b; 1099 tex->b = b;
1086 tex->a = a; 1100 tex->a = a;
1087 } 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);
1088} 1108}
1089 1109
1090int 1110int
1091ox (CFClient::Map self) 1111ox (CFClient::Map self)
1092 ALIAS: 1112 ALIAS:
… …
1530 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1531 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1532 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1533 const_iv (GL_DITHER), 1553 const_iv (GL_DITHER),
1534 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1535 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),
1536 const_iv (GL_AND), 1561 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1562 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1563 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1565 const_iv (GL_SRC_ALPHA_SATURATE),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1543 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1545 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1546 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY), 1574 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE), 1575 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA), 1576 const_iv (GL_LUMINANCE_ALPHA),
1550 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
… …
1568 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1570 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1571 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1572 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1573 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1574 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1575 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1576 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1577 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1578 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1579 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1580 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1581 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1582 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1583 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),
1584 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585 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),
1586# undef const_iv 1622# undef const_iv
1587 }; 1623 };
1588 1624
1589 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; )
1590 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1605 1641
1606void glHint (int target, int mode) 1642void glHint (int target, int mode)
1607 1643
1608void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1609 1645
1646void glDepthMask (int flag)
1647
1610void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1611 1649
1612void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1613 1651
1614void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
… …
1617 1655
1618void glPopMatrix () 1656void glPopMatrix ()
1619 1657
1620void glLoadIdentity () 1658void glLoadIdentity ()
1621 1659
1622# 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
1623void 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_)
1624 1665
1625void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1626 1667
1627void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
… …
1643void glEnd () 1684void glEnd ()
1644 1685
1645void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1646 PROTOTYPE: @ 1687 PROTOTYPE: @
1647 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1648 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1649 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1650 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1651 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1652 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
1653void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1654 CODE: 1707 CODE:
1655 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1656 1709
1657void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
… …
1684 1737
1685void 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)
1686 1739
1687void 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)
1688 1741
1689void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690 CODE:
1691 glRasterPos2i (x, y);
1692 1743
1693void 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)
1694 1745
1695int glGenTexture () 1746int glGenTexture ()
1696 CODE: 1747 CODE:
… …
1723 1774
1724void glEndList () 1775void glEndList ()
1725 1776
1726void glCallList (int list) 1777void glCallList (int list)
1727 1778
1779

Diff Legend

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