caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://slave.lautre.net:22/home/projects/fougsys/fougdataex

Browse Source
This commit is contained in:
Hugues Delorme 2013-04-29 15:48:45 +02:00
commit 5467ff633f
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake.build/foug_datax.pro
View File

@ -99,6 +99,9 @@ contains(DATAX, occ_support) {
INCLUDEPATH += $$CASCADE_ROOT/inc INCLUDEPATH += $$CASCADE_ROOT/inc
win32-*:DEFINES *= WNT
linux-*:DEFINES *= LIN LININTEL OCC_CONVERT_SIGNALS
*-64:DEFINES *= _OCC64
!win32:DEFINES *= HAVE_CONFIG_H \ !win32:DEFINES *= HAVE_CONFIG_H \
HAVE_FSTREAM \ HAVE_FSTREAM \
HAVE_IOSTREAM \ HAVE_IOSTREAM \
@ -119,7 +122,7 @@ contains(DATAX, occ_support) {
win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/lib win32-msvc2010:CASCADE_LIBPATH = $$CASCADE_ROOT/win32/vc10/lib
} }
LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel LIBS += -L$$CASCADE_LIBPATH -lTKSTL -lTKernel -lTKMath
QMAKE_RPATHDIR += $$CASCADE_LIBPATH QMAKE_RPATHDIR += $$CASCADE_LIBPATH
occ_support_inc.path = $$PREFIX_DIR/include/datax/c/support occ_support_inc.path = $$PREFIX_DIR/include/datax/c/support

24
src/c/support/occ_libstl.cpp
View File

@ -94,25 +94,25 @@ static void occ_mesh_stlb_ogeom_get_triangle(const foug_stlb_geom_output_t* geom
Standard_Real yN; Standard_Real yN;
Standard_Real zN; Standard_Real zN;
tri->GetVertexAndOrientation(v1, v2, v3, xN, yN, zN); tri->GetVertexAndOrientation(v1, v2, v3, xN, yN, zN);
facet->data.normal.x = xN; facet->data.normal.x = static_cast<foug_real32_t>(xN);
facet->data.normal.y = yN; facet->data.normal.y = static_cast<foug_real32_t>(yN);
facet->data.normal.z = zN; facet->data.normal.z = static_cast<foug_real32_t>(zN);
const TColgp_SequenceOfXYZ& vertices = (*mesh)->Vertices(1); const TColgp_SequenceOfXYZ& vertices = (*mesh)->Vertices(1);
const gp_XYZ& coordsV1 = vertices.Value(v1); const gp_XYZ& coordsV1 = vertices.Value(v1);
const gp_XYZ& coordsV2 = vertices.Value(v2); const gp_XYZ& coordsV2 = vertices.Value(v2);
const gp_XYZ& coordsV3 = vertices.Value(v3); const gp_XYZ& coordsV3 = vertices.Value(v3);
facet->data.v1.x = coordsV1.X(); facet->data.v1.x = static_cast<foug_real32_t>(coordsV1.X());
facet->data.v2.x = coordsV2.X(); facet->data.v2.x = static_cast<foug_real32_t>(coordsV2.X());
facet->data.v3.x = coordsV3.X(); facet->data.v3.x = static_cast<foug_real32_t>(coordsV3.X());
facet->data.v1.y = coordsV1.Y(); facet->data.v1.y = static_cast<foug_real32_t>(coordsV1.Y());
facet->data.v2.y = coordsV2.Y(); facet->data.v2.y = static_cast<foug_real32_t>(coordsV2.Y());
facet->data.v3.y = coordsV3.Y(); facet->data.v3.y = static_cast<foug_real32_t>(coordsV3.Y());
facet->data.v1.z = coordsV1.Z(); facet->data.v1.z = static_cast<foug_real32_t>(coordsV1.Z());
facet->data.v2.z = coordsV2.Z(); facet->data.v2.z = static_cast<foug_real32_t>(coordsV2.Z());
facet->data.v3.z = coordsV3.Z(); facet->data.v3.z = static_cast<foug_real32_t>(coordsV3.Z());
facet->attribute_byte_count = 0; facet->attribute_byte_count = 0;
} }