rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-10 03:11:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug in new curves code

Browse source
This commit is contained in:
James Canete 2012-04-28 19:35:34 +00:00
parent ca2348c0ef
commit 2a6d34b4b4
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reaction/Reaction-ChangeLog
View file

@ -1,3 +1,4 @@
- Fix a bug in new curves code
- System menu makes a bit more sense now (removed irrelevant options, added new presets) - System menu makes a bit more sense now (removed irrelevant options, added new presets)
- Change imagelist cmd to give more relevant information - Change imagelist cmd to give more relevant information
- Remove DiffuseRoughness shader param, add SpecularExponent shader param - Remove DiffuseRoughness shader param, add SpecularExponent shader param

12
reaction/code/renderergl2/tr_curve.c
View file

@ -537,7 +537,7 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
consecutiveComplete = 0; consecutiveComplete = 0;
// horizontal subdivisions // horizontal subdivisions
for ( j = 0 ; ; j = (j + 2) % (width - 2) ) { for ( j = 0 ; ; j = (j + 2) % (width - 1) ) {
// check subdivided midpoints against control points // check subdivided midpoints against control points
// FIXME: also check midpoints of adjacent patches against the control points // FIXME: also check midpoints of adjacent patches against the control points
@ -579,9 +579,8 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
// if all the points are on the lines, remove the entire columns // if all the points are on the lines, remove the entire columns
if ( maxLen < 0.1f ) { if ( maxLen < 0.1f ) {
errorTable[dir][j+1] = 999; errorTable[dir][j+1] = 999;
consecutiveComplete++;
// if we go over the whole grid twice without adding any columns, stop // if we go over the whole grid twice without adding any columns, stop
if (consecutiveComplete >= (width - 2)) if (++consecutiveComplete >= width)
break; break;
continue; continue;
} }
@ -594,17 +593,16 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
if ( maxLen <= r_subdivisions->value ) { if ( maxLen <= r_subdivisions->value ) {
errorTable[dir][j+1] = 1.0f/maxLen; errorTable[dir][j+1] = 1.0f/maxLen;
consecutiveComplete++;
// if we go over the whole grid twice without adding any columns, stop // if we go over the whole grid twice without adding any columns, stop
if (consecutiveComplete >= (width - 2)) if (++consecutiveComplete >= width)
break; break;
continue; // didn't need subdivision continue; // didn't need subdivision
} }
consecutiveComplete = 0;
errorTable[dir][j+2] = 1.0f/maxLen; errorTable[dir][j+2] = 1.0f/maxLen;
consecutiveComplete = 0;
// insert two columns and replace the peak // insert two columns and replace the peak
width += 2; width += 2;
for ( i = 0 ; i < height ; i++ ) { for ( i = 0 ; i < height ; i++ ) {