Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Ifc: improved subsampling of curves for IfcSweptDiskSolid entities.

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2012-07-11 23:08:44 +00:00
parent d7410e6f08
commit d7fe61c255
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/IFCGeometry.cpp
View File

@@ -560,13 +560,19 @@ void ProcessSweptDiskSolid(const IfcSweptDiskSolid solid, TempMesh& result, Conv
result.verts.reserve(cnt_segments * samples * 4);
result.vertcnt.reserve((cnt_segments - 1) * samples);
// XXX while EstimateSampleCount() works well for non-composite curves, it
// fails badly for composite curves that require non-uniform sampling
// for good results.
IfcFloat p = solid.StartParam, delta = (solid.EndParam-solid.StartParam)/ (samples - 1);
std::vector<IfcVector3> points;
points.reserve(cnt_segments * samples);
IfcVector3 current = curve->Eval(p);
TempMesh temp;
curve->SampleDiscrete(temp,solid.StartParam,solid.EndParam);
const std::vector<IfcVector3>& curve_points = temp.verts;
if(curve_points.empty()) {
IFCImporter::LogWarn("curve evaluation yielded no points (IfcSweptDiskSolid)");
return;
}
IfcVector3 current = curve_points[0];
IfcVector3 previous = current;
IfcVector3 next;
@@ -575,15 +581,12 @@ void ProcessSweptDiskSolid(const IfcSweptDiskSolid solid, TempMesh& result, Conv
startvec.y = 1.0f;
startvec.z = 1.0f;
std::vector<IfcVector3> points;
points.reserve(cnt_segments * samples);
p += delta;
// generate circles at the sweep positions
for(size_t i = 0; i < samples; ++i, p += delta) {
for(size_t i = 0; i < samples; ++i) {
next = curve->Eval(p);
if(i != samples - 1) {
next = curve_points[i + 1];
}
// get a direction vector reflecting the approximate curvature (i.e. tangent)
IfcVector3 d = (current-previous) + (next-previous);