Fix tiled snapshots. Also, LLRender::genRot takes degrees, not radians.

This commit is contained in:
Shyotl
2014-09-02 02:53:10 -05:00
parent 992bbbba1c
commit e9cf3a6806
2 changed files with 2 additions and 2 deletions

View File

@@ -1004,7 +1004,7 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po
F32 ang = acos(projected_binormal.mV[VY]);
ang = (projected_binormal.mV[VX] < 0.f) ? -ang : ang;
gGL.genRot(ang, normal).rotate(binormal, binormal);
gGL.genRot(RAD_TO_DEG * ang, normal).rotate(binormal, binormal);
LLVector4a x_axis;
x_axis.setCross3(binormal, normal);

View File

@@ -293,8 +293,8 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
int pos_y = mZoomSubregion / llceil(mZoomFactor);
int pos_x = mZoomSubregion - (pos_y*llceil(mZoomFactor));
proj_mat.applyScale_affine(mZoomFactor,mZoomFactor,1.f);
proj_mat.applyTranslation_affine(offset - (F32)pos_x * 2.f, offset - (F32)pos_y * 2.f, 0.f);
proj_mat.applyScale_affine(mZoomFactor,mZoomFactor,1.f);
}
calcProjection(z_far); // Update the projection matrix cache