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.85 by root, Fri May 19 03:49:47 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);
… …
470 470
471 ++m; 471 ++m;
472 } 472 }
473} 473}
474 474
475char *
476SDL_GetError ()
477
475int 478int
476SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 480 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
488void 491void
489SDL_PollEvent () 492SDL_PollEvent ()
490 PPCODE: 493 PPCODE:
491{ 494{
492 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 };
493 508
494 while (SDL_PollEvent (&ev)) 509 while (SDL_PollEvent (&ev))
495 { 510 {
496 HV *hv = newHV (); 511 HV *hv = newHV ();
497 hv_store (hv, "type", 4, newSViv (ev.type), 0); 512 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498 513
499 switch (ev.type) 514 switch (ev.type)
500 { 515 {
501 case SDL_KEYDOWN: 516 case SDL_KEYDOWN:
502 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
503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
504 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
505 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
506 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
507 break; 533 break;
… …
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 538 break;
513 539
514 case SDL_MOUSEMOTION: 540 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0);
542
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 548 break;
521 549
522 case SDL_MOUSEBUTTONDOWN: 550 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 551 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0);
553
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 558 break;
… …
554lowdelay (int fd, int val = 1) 584lowdelay (int fd, int val = 1)
555 CODE: 585 CODE:
556#ifndef _WIN32 586#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 588#endif
589
590char *
591gl_vendor ()
592 CODE:
593 RETVAL = (char *)glGetString (GL_VENDOR);
594 OUTPUT:
595 RETVAL
559 596
560char * 597char *
561gl_version () 598gl_version ()
562 CODE: 599 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION); 600 RETVAL = (char *)glGetString (GL_VERSION);
… …
670} 707}
671 708
672void 709void
673error (char *message) 710error (char *message)
674 CODE: 711 CODE:
712 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 713#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 714 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 715#endif
680 716
681void 717void
682fatal (char *message) 718fatal (char *message)
683 CODE: 719 CODE:
720 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 721#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 722 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 723#endif
689 exit (1); 724 exit (1);
690 725
691MODULE = CFClient PACKAGE = CFClient::Font 726MODULE = CFClient PACKAGE = CFClient::Font
692 727
… …
715MODULE = CFClient PACKAGE = CFClient::Layout 750MODULE = CFClient PACKAGE = CFClient::Layout
716 751
717CFClient::Layout 752CFClient::Layout
718new (SV *class, int rgba = 0) 753new (SV *class, int rgba = 0)
719 CODE: 754 CODE:
755#if _WIN32
756 rgba = 0;//D
757#endif
720 New (0, RETVAL, 1, struct cf_layout); 758 New (0, RETVAL, 1, struct cf_layout);
721 759
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
723 RETVAL->rgba = rgba; 761 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 762 RETVAL->r = 1.;
… …
904 942
905 while (p < e) 943 while (p < e)
906 { 944 {
907 uint32_t rgba = *p; 945 uint32_t rgba = *p;
908 rgba = (rgba >> 24) | (rgba << 8); 946 rgba = (rgba >> 24) | (rgba << 8);
947#if 0
948#ifdef _WIN32
949 {//D
950 uint8_t r = rgba >> 24;
951 uint8_t g = rgba >> 16;
952 uint8_t b = rgba >> 8;
953 uint8_t a = rgba >> 0;
954
955 rgba = (rgba & 0xffffff00) | a;
956 }
957#endif
958#endif
909 rgba = SDL_SwapBE32 (rgba); 959 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba; 960 *p++ = rgba;
911 } 961 }
912 } 962 }
913 963
… …
970 1020
971 if (ix) 1021 if (ix)
972 { 1022 {
973 glEnable (GL_BLEND); 1023 glEnable (GL_BLEND);
974 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1024 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1025 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f);
975 } 1027 }
976 1028
977 glBindTexture (GL_TEXTURE_2D, name); 1029 glBindTexture (GL_TEXTURE_2D, name);
978 1030
979 if (wrap_mode) 1031 if (wrap_mode)
… …
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1041 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1042 glEnd ();
991 1043
992 if (ix) 1044 if (ix)
1045 {
1046 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1047 glDisable (GL_BLEND);
1048 }
994} 1049}
995 1050
996MODULE = CFClient PACKAGE = CFClient::Map 1051MODULE = CFClient PACKAGE = CFClient::Map
997 1052
998CFClient::Map 1053CFClient::Map
… …
1509 const_iv (GL_COLOR_MATERIAL), 1564 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 1565 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 1566 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 1567 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 1568 const_iv (GL_BLEND),
1569 const_iv (GL_CULL_FACE),
1514 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),
1515 const_iv (GL_AND), 1575 const_iv (GL_AND),
1516 const_iv (GL_ONE), 1576 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 1577 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 1578 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 1579 const_iv (GL_SRC_ALPHA_SATURATE),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1580 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1581 const_iv (GL_ONE_MINUS_DST_ALPHA),
1522 const_iv (GL_RGB), 1582 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 1583 const_iv (GL_RGBA),
1524 const_iv (GL_UNSIGNED_BYTE), 1584 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 1587 const_iv (GL_ALPHA),
1588 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1589 const_iv (GL_LUMINANCE),
1590 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1591 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1593 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1594 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1595 const_iv (GL_TEXTURE_2D),
… …
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1609 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 1610 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 1611 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 1612 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 1613 const_iv (GL_REPLACE),
1614 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 1615 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 1616 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 1617 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 1618 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 1619 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 1620 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 1621 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 1622 const_iv (GL_CONSTANT_BORDER),
1558 const_iv (GL_LINES), 1623 const_iv (GL_LINES),
1624 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 1625 const_iv (GL_QUADS),
1560 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),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1630 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562 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),
1563# undef const_iv 1636# undef const_iv
1564 }; 1637 };
1565 1638
1566 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; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1582 1655
1583void glHint (int target, int mode) 1656void glHint (int target, int mode)
1584 1657
1585void glBlendFunc (int sfactor, int dfactor) 1658void glBlendFunc (int sfactor, int dfactor)
1586 1659
1660void glDepthMask (int flag)
1661
1587void glLogicOp (int opcode) 1662void glLogicOp (int opcode)
1588 1663
1589void glColorMask (int red, int green, int blue, int alpha) 1664void glColorMask (int red, int green, int blue, int alpha)
1590 1665
1591void glMatrixMode (int mode) 1666void glMatrixMode (int mode)
… …
1594 1669
1595void glPopMatrix () 1670void glPopMatrix ()
1596 1671
1597void glLoadIdentity () 1672void glLoadIdentity ()
1598 1673
1599# 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
1600void 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_)
1601 1679
1602void glViewport (int x, int y, int width, int height) 1680void glViewport (int x, int y, int width, int height)
1603 1681
1604void glScissor (int x, int y, int width, int height) 1682void glScissor (int x, int y, int width, int height)
… …
1620void glEnd () 1698void glEnd ()
1621 1699
1622void glColor (float r, float g, float b, float a = 1.0) 1700void glColor (float r, float g, float b, float a = 1.0)
1623 PROTOTYPE: @ 1701 PROTOTYPE: @
1624 CODE: 1702 CODE:
1703 // microsoft visual "c" rounds instead of truncating...
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 1704 glColor4ub (MIN ((int)(r * 255.f), 255),
1626 MIN ((int)(g * 255.f), 255), 1705 MIN ((int)(g * 255.f), 255),
1627 MIN ((int)(b * 255.f), 255), 1706 MIN ((int)(b * 255.f), 255),
1628 MIN ((int)(a * 255.f), 255)); 1707 MIN ((int)(a * 255.f), 255));
1629 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
1630void glVertex (float x, float y, float z = 0.) 1720void glVertex (float x, float y, float z = 0.)
1631 CODE: 1721 CODE:
1632 glVertex3f (x, y, z); 1722 glVertex3f (x, y, z);
1633 1723
1634void glTexCoord (float s, float t) 1724void glTexCoord (float s, float t)
… …
1661 1751
1662void 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)
1663 1753
1664void 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)
1665 1755
1666void glRasterPos (int x, int y) 1756void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667 CODE:
1668 glRasterPos2i (x, y);
1669 1757
1670void 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)
1671 1759
1672int glGenTexture () 1760int glGenTexture ()
1673 CODE: 1761 CODE:
… …
1700 1788
1701void glEndList () 1789void glEndList ()
1702 1790
1703void glCallList (int list) 1791void glCallList (int list)
1704 1792
1793

Diff Legend

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