AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-28 22:31:07 +00:00
Code Issues Releases Wiki Activity

Fix VS2010 build errors in FarStencilTablesFactory

Browse Source 
We shouldn't have to declare these classes as friends, MS compiler's the
only one issuing errors, and they are very likely incorrect.
This commit is contained in:
manuelk 2013-10-30 11:56:54 -07:00
parent 9d60586400
commit 14355da767
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opensubdiv/far/stencilTablesFactory.h
View File

@ -121,6 +121,9 @@ public:
private:
friend class FarVertexStencil;
friend class FarStencilFactoryVertex;
// Reserve space for stencils of a set size at the end of a stencil table
void _AddNewStencils( FarStencilTables * tables, int nstencils, int stencilsize);
@ -560,6 +563,10 @@ public:
///
void ApplyVertexEdit(OpenSubdiv::HbrVertexEdit<FarStencilFactoryVertex> const & edit) { }
/// \brief Hbr template vertex class API: edits are not supported yet
///
void ApplyMovingVertexEdit(const OpenSubdiv::HbrMovingVertexEdit<FarStencilFactoryVertex> &) { }
private:
template <class T> friend class FarStencilTablesFactory<T>::Patch;
@ -1515,7 +1522,7 @@ FarStencilTablesFactory<T>::Patch::_GetTangentLimitStencils( HbrHalfedge<T> * e,
int n = v->GetValence();
float alpha = 2.0f * M_PI / (float) n,
float alpha = 2.0f * static_cast<float>(M_PI) / (float) n,
c0 = 2.0f * cosf(alpha),
c1 = 1.0f,
A = 1.0f + c0 + sqrtf(18.0f + c0) * cosf(0.5f * alpha);