haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invocation of glm::cross and glm::normalize

This commit is contained in:
Cirilo Bernardo 2016-03-15 11:38:55 +11:00
parent 968a18a859
commit a30151231f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_cache/sg/ifsg_api.cpp
View File

@ -647,8 +647,8 @@ SGVECTOR S3D::CalcTriNorm( const SGPOINT& p1, const SGPOINT& p2, const SGPOINT&
return SGVECTOR( 0.0, 0.0, 1.0 );
// normal
tri = cross( pts[1] - pts[0], pts[2] - pts[0] );
normalize( tri );
tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] );
glm::normalize( tri );
return SGVECTOR( tri.x, tri.y, tri.z );
}

2
3d-viewer/3d_cache/sg/sg_helpers.cpp
View File

@ -375,7 +375,7 @@ static void calcTriad( glm::dvec3* pts, glm::dvec3& tri )
}
// normal * 2 * area
tri = cross( pts[1] - pts[0], pts[2] - pts[0] );
tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] );
return;
}