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.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC

1073 } 1073 }
1074 1074
1075 // somewhat hackish, but for textures that require it, it really 1075 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer. 1076 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name); 1077 glBindTexture (GL_TEXTURE_2D, name);
1078 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1078 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1079 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1080 // use uglier nearest interpolation because linear suffers
1081 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080} 1083}
1081 1084
1082int 1085int
1083ox (CFClient::Map self) 1086ox (CFClient::Map self)
1084 ALIAS: 1087 ALIAS:
1085 oy = 1 1088 oy = 1
1089 x = 2
1090 y = 3
1091 w = 4
1092 h = 5
1086 CODE: 1093 CODE:
1087 switch (ix) 1094 switch (ix)
1088 { 1095 {
1089 case 0: RETVAL = self->ox; break; 1096 case 0: RETVAL = self->ox; break;
1090 case 1: RETVAL = self->oy; break; 1097 case 1: RETVAL = self->oy; break;
1098 case 2: RETVAL = self->x; break;
1099 case 3: RETVAL = self->y; break;
1100 case 4: RETVAL = self->w; break;
1101 case 5: RETVAL = self->h; break;
1091 } 1102 }
1092 OUTPUT: 1103 OUTPUT:
1093 RETVAL 1104 RETVAL
1094 1105
1095void 1106void
1679 1690
1680void glColor (float r, float g, float b, float a = 1.0) 1691void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1692 PROTOTYPE: @
1682 CODE: 1693 CODE:
1683 // microsoft visual "c" rounds instead of truncating... 1694 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1695 glColor4ub (MIN ((int)(r * 256.f), 255),
1685 MIN ((int)(g * 255.f), 255), 1696 MIN ((int)(g * 256.f), 255),
1686 MIN ((int)(b * 255.f), 255), 1697 MIN ((int)(b * 256.f), 255),
1687 MIN ((int)(a * 255.f), 255)); 1698 MIN ((int)(a * 256.f), 255));
1688 1699
1689void glInterleavedArrays (int format, int stride, char *data) 1700void glInterleavedArrays (int format, int stride, char *data)
1690 1701
1691void glDrawElements (int mode, int count, int type, char *indices) 1702void glDrawElements (int mode, int count, int type, char *indices)
1692 1703

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines