kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix scaling if scale is < 1.0

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6418 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
sireus
2011-05-11 09:57:25 +00:00
parent 9bc5934c17
commit 7cb0fe4f06
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference.xml
+1 -1
View File
@@ -6319,7 +6319,7 @@ Output:
</variable> </variable>
<variable name="hirestextures"> <variable name="hirestextures">
<description>controls whether textures with a non-default scale will be scaled down while loading to increase performance (0) or stay at higher resolution (1).</description> <description>controls whether textures with a scale higher than 1.0 will be scaled down while loading to increase performance (0) or stay at higher resolution (1).</description>
<value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="1" /> <value token="N" description="TODO" minValue="0" maxValue="1" defaultValue="1" />
<references> <references>
<identifierReference name="texture" identifier="texture"/> <identifierReference name="texture" identifier="texture"/>
source/src/rendercubes.cpp
+4 -3
View File
@@ -107,7 +107,7 @@ void addstrip(int type, int tex, int start, int n)
#define vert(v1, v2, v3, ls, t1, t2) \ #define vert(v1, v2, v3, ls, t1, t2) \
{ \ { \
vertex &v = verts.add(); \ vertex &v = verts.add(); \
v.u = t1; v.v = t2; \ v.u = t1; v.v = t2; \
v.x = (float)(v1); v.y = (float)(v2); v.z = (float)(v3); \ v.x = (float)(v1); v.y = (float)(v2); v.z = (float)(v3); \
v.r = ls->r; v.g = ls->g; v.b = ls->b; v.a = 255; \ v.r = ls->r; v.g = ls->g; v.b = ls->b; v.a = 255; \
@@ -123,9 +123,10 @@ enum
int nquads; int nquads;
// for testing purpose. UNDOME on release. // for testing purpose. UNDOME on release.
//const float TEXTURESCALE = 32.0f; //const float texturescale = 32.0f;
VARP(texturescale, 16, 32, 64); VARP(texturescale, 16, 32, 64);
#define TEXTURESCALE (float(texturescale) * (uniformtexres ? 1.0f : t->scale))
#define TEXTURESCALE (float(texturescale) * ((uniformtexres && t->scale>1.0f) ? 1.0f : t->scale))
int striptype = 0, striptex, oh, oy, ox, odir; // the o* vars are used by the stripification int striptype = 0, striptex, oh, oy, ox, odir; // the o* vars are used by the stripification
int ol1r, ol1g, ol1b, ol2r, ol2g, ol2b; int ol1r, ol1g, ol1b, ol2r, ol2g, ol2b;