correction for tab
This commit is contained in:
parent
5f6400c032
commit
d876bb6246
|
@ -26,62 +26,62 @@ Licence:
|
|||
|
||||
bool pFlow::stlWall::readSTLWall
|
||||
(
|
||||
const dictionary& dict
|
||||
const dictionary& dict
|
||||
)
|
||||
{
|
||||
auto fileName = dict.getVal<word>("file");
|
||||
auto fileName = dict.getVal<word>("file");
|
||||
|
||||
real scale = dict.getValOrSet("scale", static_cast<real>(1.0));
|
||||
real scale = dict.getValOrSet("scale", static_cast<real>(1.0));
|
||||
|
||||
realx3 transform = dict.getValOrSet<realx3>("transform", realx3(0));
|
||||
realx3 transform = dict.getValOrSet<realx3>("transform", realx3(0));
|
||||
|
||||
auto scaleFirst = dict.getValOrSet("scaleFirst", Logical("Yes"));
|
||||
|
||||
fileSystem file("./stl",fileName);
|
||||
auto scaleFirst = dict.getValOrSet("scaleFirst", Logical("Yes"));
|
||||
|
||||
fileSystem file("./stl",fileName);
|
||||
|
||||
stlFile stl(file);
|
||||
if(!stl.read())
|
||||
{
|
||||
fatalErrorInFunction <<
|
||||
" error in reading stl file "<< file <<endl;
|
||||
return false;
|
||||
}
|
||||
stlFile stl(file);
|
||||
if(!stl.read())
|
||||
{
|
||||
fatalErrorInFunction <<
|
||||
" error in reading stl file "<< file <<endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Scale and transform the stl vertex
|
||||
realx3x3Vector newStlVertx;
|
||||
for(uint64 i = 0; i < stl.size(); i++)
|
||||
{
|
||||
for(uint64 j = 0; j < stl.solid(i).size(); j++)
|
||||
{
|
||||
realx3x3 tri;
|
||||
// Scale and transform the stl vertex
|
||||
realx3x3Vector newStlVertx;
|
||||
for(uint64 i = 0; i < stl.size(); i++)
|
||||
{
|
||||
for(uint64 j = 0; j < stl.solid(i).size(); j++)
|
||||
{
|
||||
realx3x3 tri;
|
||||
|
||||
if(scaleFirst)
|
||||
{
|
||||
tri.x() = stl.solid(i)[j].x() * scale + transform.x();
|
||||
tri.y() = stl.solid(i)[j].y() * scale + transform.y();
|
||||
tri.z() = stl.solid(i)[j].z() * scale + transform.z();
|
||||
}
|
||||
else
|
||||
{
|
||||
tri.x() = (stl.solid(i)[j].x() + transform.x()) * scale;
|
||||
tri.y() = (stl.solid(i)[j].y() + transform.y()) * scale;
|
||||
tri.z() = (stl.solid(i)[j].z() + transform.z()) * scale;
|
||||
}
|
||||
if(scaleFirst)
|
||||
{
|
||||
tri.x() = stl.solid(i)[j].x() * scale + transform.x();
|
||||
tri.y() = stl.solid(i)[j].y() * scale + transform.y();
|
||||
tri.z() = stl.solid(i)[j].z() * scale + transform.z();
|
||||
}
|
||||
else
|
||||
{
|
||||
tri.x() = (stl.solid(i)[j].x() + transform.x()) * scale;
|
||||
tri.y() = (stl.solid(i)[j].y() + transform.y()) * scale;
|
||||
tri.z() = (stl.solid(i)[j].z() + transform.z()) * scale;
|
||||
}
|
||||
|
||||
newStlVertx.push_back(tri);
|
||||
}
|
||||
}
|
||||
newStlVertx.push_back(tri);
|
||||
}
|
||||
}
|
||||
|
||||
// Insert the new vertex to the triangles_
|
||||
for(uint64 i = 0; i < stl.size(); i++)
|
||||
{
|
||||
auto it = triangles_.end();
|
||||
triangles_.insert(it, newStlVertx.begin(), newStlVertx.end());
|
||||
}
|
||||
|
||||
// Insert the new vertex to the triangles_
|
||||
for(uint64 i = 0; i < stl.size(); i++)
|
||||
{
|
||||
auto it = triangles_.end();
|
||||
triangles_.insert(it, newStlVertx.begin(), newStlVertx.end());
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
pFlow::stlWall::stlWall()
|
||||
|
@ -89,13 +89,13 @@ pFlow::stlWall::stlWall()
|
|||
|
||||
pFlow::stlWall::stlWall
|
||||
(
|
||||
const dictionary& dict
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
Wall(dict)
|
||||
Wall(dict)
|
||||
{
|
||||
if(!readSTLWall(dict))
|
||||
{
|
||||
fatalExit;
|
||||
}
|
||||
if(!readSTLWall(dict))
|
||||
{
|
||||
fatalExit;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue