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.93 by root, Tue May 23 18:54:37 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);
… …
491void 491void
492SDL_PollEvent () 492SDL_PollEvent ()
493 PPCODE: 493 PPCODE:
494{ 494{
495 SDL_Event ev; 495 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
496 508
497 while (SDL_PollEvent (&ev)) 509 while (SDL_PollEvent (&ev))
498 { 510 {
499 HV *hv = newHV (); 511 HV *hv = newHV ();
500 hv_store (hv, "type", 4, newSViv (ev.type), 0); 512 hv_store (hv, "type", 4, newSViv (ev.type), 0);
501 513
502 switch (ev.type) 514 switch (ev.type)
503 { 515 {
504 case SDL_KEYDOWN: 516 case SDL_KEYDOWN:
505 case SDL_KEYUP: 517 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
506 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
507 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
508 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
509 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
510 break; 533 break;
… …
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 538 break;
516 539
517 case SDL_MOUSEMOTION: 540 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0);
542
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 548 break;
524 549
525 case SDL_MOUSEBUTTONDOWN: 550 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 551 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0);
553
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 558 break;
… …
557lowdelay (int fd, int val = 1) 584lowdelay (int fd, int val = 1)
558 CODE: 585 CODE:
559#ifndef _WIN32 586#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 588#endif
589
590char *
591gl_vendor ()
592 CODE:
593 RETVAL = (char *)glGetString (GL_VENDOR);
594 OUTPUT:
595 RETVAL
562 596
563char * 597char *
564gl_version () 598gl_version ()
565 CODE: 599 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION); 600 RETVAL = (char *)glGetString (GL_VERSION);
… …
1530 const_iv (GL_COLOR_MATERIAL), 1564 const_iv (GL_COLOR_MATERIAL),
1531 const_iv (GL_SMOOTH), 1565 const_iv (GL_SMOOTH),
1532 const_iv (GL_FLAT), 1566 const_iv (GL_FLAT),
1533 const_iv (GL_DITHER), 1567 const_iv (GL_DITHER),
1534 const_iv (GL_BLEND), 1568 const_iv (GL_BLEND),
1569 const_iv (GL_CULL_FACE),
1535 const_iv (GL_SCISSOR_TEST), 1570 const_iv (GL_SCISSOR_TEST),
1571 const_iv (GL_DEPTH_TEST),
1572 const_iv (GL_ALPHA_TEST),
1573 const_iv (GL_NORMALIZE),
1574 const_iv (GL_RESCALE_NORMAL),
1536 const_iv (GL_AND), 1575 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1576 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1577 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1578 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1579 const_iv (GL_SRC_ALPHA_SATURATE),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1580 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1581 const_iv (GL_ONE_MINUS_DST_ALPHA),
1543 const_iv (GL_RGB), 1582 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1583 const_iv (GL_RGBA),
1545 const_iv (GL_UNSIGNED_BYTE), 1584 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT),
1546 const_iv (GL_ALPHA), 1587 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY), 1588 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE), 1589 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA), 1590 const_iv (GL_LUMINANCE_ALPHA),
1550 const_iv (GL_FLOAT), 1591 const_iv (GL_FLOAT),
… …
1568 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1609 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569 const_iv (GL_GENERATE_MIPMAP), 1610 const_iv (GL_GENERATE_MIPMAP),
1570 const_iv (GL_MODULATE), 1611 const_iv (GL_MODULATE),
1571 const_iv (GL_DECAL), 1612 const_iv (GL_DECAL),
1572 const_iv (GL_REPLACE), 1613 const_iv (GL_REPLACE),
1614 const_iv (GL_DEPTH_BUFFER_BIT),
1573 const_iv (GL_COLOR_BUFFER_BIT), 1615 const_iv (GL_COLOR_BUFFER_BIT),
1574 const_iv (GL_PROJECTION), 1616 const_iv (GL_PROJECTION),
1575 const_iv (GL_MODELVIEW), 1617 const_iv (GL_MODELVIEW),
1576 const_iv (GL_COLOR_LOGIC_OP), 1618 const_iv (GL_COLOR_LOGIC_OP),
1577 const_iv (GL_SEPARABLE_2D), 1619 const_iv (GL_SEPARABLE_2D),
1578 const_iv (GL_CONVOLUTION_2D), 1620 const_iv (GL_CONVOLUTION_2D),
1579 const_iv (GL_CONVOLUTION_BORDER_MODE), 1621 const_iv (GL_CONVOLUTION_BORDER_MODE),
1580 const_iv (GL_CONSTANT_BORDER), 1622 const_iv (GL_CONSTANT_BORDER),
1581 const_iv (GL_LINES), 1623 const_iv (GL_LINES),
1624 const_iv (GL_LINE_LOOP),
1582 const_iv (GL_QUADS), 1625 const_iv (GL_QUADS),
1583 const_iv (GL_LINE_LOOP), 1626 const_iv (GL_QUAD_STRIP),
1627 const_iv (GL_TRIANGLES),
1628 const_iv (GL_TRIANGLE_STRIP),
1629 const_iv (GL_TRIANGLE_FAN),
1584 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1630 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585 const_iv (GL_FASTEST), 1631 const_iv (GL_FASTEST),
1632 const_iv (GL_V2F),
1633 const_iv (GL_V3F),
1634 const_iv (GL_T2F_V3F),
1635 const_iv (GL_T2F_N3F_V3F),
1586# undef const_iv 1636# undef const_iv
1587 }; 1637 };
1588 1638
1589 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1590 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1605 1655
1606void glHint (int target, int mode) 1656void glHint (int target, int mode)
1607 1657
1608void glBlendFunc (int sfactor, int dfactor) 1658void glBlendFunc (int sfactor, int dfactor)
1609 1659
1660void glDepthMask (int flag)
1661
1610void glLogicOp (int opcode) 1662void glLogicOp (int opcode)
1611 1663
1612void glColorMask (int red, int green, int blue, int alpha) 1664void glColorMask (int red, int green, int blue, int alpha)
1613 1665
1614void glMatrixMode (int mode) 1666void glMatrixMode (int mode)
… …
1617 1669
1618void glPopMatrix () 1670void glPopMatrix ()
1619 1671
1620void glLoadIdentity () 1672void glLoadIdentity ()
1621 1673
1622# near and far are due to microsofts buggy c compiler 1674# near_ and far_ are due to microsofts buggy "c" compiler
1675void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676
1677# near_ and far_ are due to microsofts buggy "c" compiler
1623void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1678void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1624 1679
1625void glViewport (int x, int y, int width, int height) 1680void glViewport (int x, int y, int width, int height)
1626 1681
1627void glScissor (int x, int y, int width, int height) 1682void glScissor (int x, int y, int width, int height)
… …
1643void glEnd () 1698void glEnd ()
1644 1699
1645void glColor (float r, float g, float b, float a = 1.0) 1700void glColor (float r, float g, float b, float a = 1.0)
1646 PROTOTYPE: @ 1701 PROTOTYPE: @
1647 CODE: 1702 CODE:
1703 // microsoft visual "c" rounds instead of truncating...
1648 glColor4ub (MIN ((int)(r * 255.f), 255), 1704 glColor4ub (MIN ((int)(r * 255.f), 255),
1649 MIN ((int)(g * 255.f), 255), 1705 MIN ((int)(g * 255.f), 255),
1650 MIN ((int)(b * 255.f), 255), 1706 MIN ((int)(b * 255.f), 255),
1651 MIN ((int)(a * 255.f), 255)); 1707 MIN ((int)(a * 255.f), 255));
1652 1708
1709void glInterleavedArrays (int format, int stride, char *data)
1710
1711void glDrawElements (int mode, int count, int type, char *indices)
1712
1713# 1.2 void glDrawRangeElements (int mode, int start, int end
1714
1715void glRasterPos (float x, float y, float z = 0.)
1716 CODE:
1717 glRasterPos3f (0, 0, z);
1718 glBitmap (0, 0, 0, 0, x, y, 0);
1719
1653void glVertex (float x, float y, float z = 0.) 1720void glVertex (float x, float y, float z = 0.)
1654 CODE: 1721 CODE:
1655 glVertex3f (x, y, z); 1722 glVertex3f (x, y, z);
1656 1723
1657void glTexCoord (float s, float t) 1724void glTexCoord (float s, float t)
… …
1684 1751
1685void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1752void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1686 1753
1687void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1754void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1688 1755
1689void glRasterPos (int x, int y) 1756void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690 CODE:
1691 glRasterPos2i (x, y);
1692 1757
1693void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1758void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1694 1759
1695int glGenTexture () 1760int glGenTexture ()
1696 CODE: 1761 CODE:
… …
1723 1788
1724void glEndList () 1789void glEndList ()
1725 1790
1726void glCallList (int list) 1791void glCallList (int list)
1727 1792
1793

Diff Legend

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