Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-12 02:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert the IfcGeomObjects API to float precision instead of double. Internally double precision is still used.

Browse Source
This commit is contained in:
Thomas Krijnen
2012-04-08 08:39:09 +00:00
parent b2b51e343f
commit 4866953119
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomObjects.cpp
+11 -11
View File
@@ -50,12 +50,12 @@ bool weld_vertices = true;
bool convert_back_units = false;
int IfcGeomObjects::IfcMesh::addvert(const gp_XYZ& p) {
const double X = convert_back_units ? (double)p.X() / Ifc::LengthUnit : (double)p.X();
const double Y = convert_back_units ? (double)p.Y() / Ifc::LengthUnit : (double)p.Y();
const double Z = convert_back_units ? (double)p.Z() / Ifc::LengthUnit : (double)p.Z();
const float X = convert_back_units ? (float) (p.X() / Ifc::LengthUnit) : (float)p.X();
const float Y = convert_back_units ? (float) (p.Y() / Ifc::LengthUnit) : (float)p.Y();
const float Z = convert_back_units ? (float) (p.Z() / Ifc::LengthUnit) : (float)p.Z();
int i = (int) verts.size() / 3;
if ( weld_vertices ) {
const VertKey key = VertKey(X,std::pair<double,double>(Y,Z));
const VertKey key = VertKey(X,std::pair<float,float>(Y,Z));
VertKeyMap::const_iterator it = welds.find(key);
if ( it != welds.end() ) return it->second;
i = (int) welds.size();
@@ -145,9 +145,9 @@ IfcGeomObjects::IfcMesh::IfcMesh(int i, const IfcGeom::ShapeList& shapes) {
gp_Vec normal_direction;
prop.Normal(uv.X(),uv.Y(),p,normal_direction);
gp_Dir normal = gp_Dir(normal_direction.XYZ() * rotation_matrix);
normals.push_back((double)normal.X());
normals.push_back((double)normal.Y());
normals.push_back((double)normal.Z());
normals.push_back((float)normal.X());
normals.push_back((float)normal.Y());
normals.push_back((float)normal.Z());
}
}
@@ -167,9 +167,9 @@ IfcGeomObjects::IfcMesh::IfcMesh(int i, const IfcGeom::ShapeList& shapes) {
const gp_XYZ v1 = pt2-pt1;
const gp_XYZ v2 = pt3-pt2;
gp_Dir normal = gp_Dir(v1^v2);
normals.push_back((double)normal.X());
normals.push_back((double)normal.Y());
normals.push_back((double)normal.Z());
normals.push_back((float)normal.X());
normals.push_back((float)normal.Y());
normals.push_back((float)normal.Z());
*/
faces.push_back(dict[n1]);
@@ -198,7 +198,7 @@ IfcGeomObjects::IfcObject::IfcObject(int my_id,
// Convert the gp_Trsf into a 4x3 Matrix
for( int i = 1; i < 5; ++ i )
for ( int j = 1; j < 4; ++ j )
matrix.push_back((double)trsf.Value(j,i));
matrix.push_back((float)trsf.Value(j,i));
id = my_id;
parent_id = p_id;
src/ifcgeom/IfcGeomObjects.h
+6 -6
View File
@@ -23,7 +23,7 @@
* and instances (SUBTYPE OF IfcBuildingElement e.g. IfcWindow). *
* *
* IfcMesh is a class that represents a triangulated IfcShapeRepresentation. *
* IfcMesh.verts is a 1 dimensional vector of double defining the cartesian *
* IfcMesh.verts is a 1 dimensional vector of float defining the cartesian *
* coordinates of the vertices of the triangulated shape in the format of *
* [x1,y1,z1,..,xn,yn,zn] *
* IfcMesh.faces is a 1 dimensional vector of int containing the indices of *
@@ -96,19 +96,19 @@ namespace IfcGeomObjects {
// Some typedefs for convenience
typedef std::vector<int>::const_iterator IntIt;
typedef std::vector<double>::const_iterator FltIt;
typedef std::vector<float>::const_iterator FltIt;
// A nested pair of doubles to be able to store an XYZ coordinate in a map.
typedef std::pair< double,std::pair<double,double> > VertKey;
typedef std::pair< float,std::pair<float,float> > VertKey;
typedef std::map<VertKey,int> VertKeyMap;
typedef std::pair<int,int> Edge;
class IfcMesh {
public:
int id;
std::vector<double> verts;
std::vector<float> verts;
std::vector<int> faces;
std::vector<int> edges;
std::vector<double> normals;
std::vector<float> normals;
std::string brep_data;
VertKeyMap welds;
@@ -130,7 +130,7 @@ namespace IfcGeomObjects {
std::string name;
std::string type;
std::string guid;
std::vector<double> matrix;
std::vector<float> matrix;
IfcObject(int my_id, int p_id, const std::string& n, const std::string& t, const std::string& g, const gp_Trsf& trsf);
};