Commit e0720cef authored by Isaak Lim's avatar Isaak Lim

- added the rest of the common interchange formats for assimp

- added some more documentation
- added some tests for DAE and XGL files

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@17172 383ad7c9-94d9-4d36-a494-682f7c89f535
parent c5492be4
......@@ -36,7 +36,7 @@
* *
* $Revision: 13361 $ *
* $LastChangedBy: moebius $ *
* $Date: 2012-01-12 16:33:16 +0100 (Thu, 12 Jan 2012) $ *
* $Date: 2012-01-12 16:33:16 +0100 (Thu, 12 Jan 2012) $ *
* *
\*===========================================================================*/
......@@ -348,7 +348,7 @@ QString AssimpPlugin::getSaveFilters() {
}
QString AssimpPlugin::getLoadFilters() {
return QString( tr("Alias/Wavefront ( *.obj );;AutoCAD DXF ( *.dxf );;Collada ( *.dae );;Stereolithography files ( *.stl );;Polygon File Format files ( *.ply );;Blender 3D( *.blend );;3ds Max 3DS ( *.3ds )") );
return QString( tr("Alias/Wavefront ( *.obj );;AutoCAD DXF ( *.dxf );;Collada ( *.dae );;Stereolithography files ( *.stl );;Polygon File Format files ( *.ply );;Blender 3D( *.blend );;3ds Max 3DS ( *.3ds );;3ds Max ASE( *.ase );;Industry Foundation Classes ( *.ifc );;XGL ( *.xgl *.zgl );;Lightwave ( *.lwo );;Lightwave Scene ( *.lws );;Modo ( *.lxo );;DirectX X ( *.x );;AC3D ( *.ac );;Milkshape 3D ( *.ms3d );;TrueSpace ( *.cob *.scn )") );
}
QWidget *AssimpPlugin::saveOptionsWidget(QString) {
......
......@@ -126,8 +126,10 @@ private slots:
private:
/// converts an aiScene to a polymesh or trimesh
int convertAiSceneToOpenMesh(const aiScene* _scene, QString _objectName);
/// converts a polymesh or trimesh to an aiScene
bool convertOpenMeshToAiScene(aiScene* _scene, BaseObjectData* _object);
/// converts _mesh into _polyMesh
......@@ -136,8 +138,10 @@ private:
/// converts _mesh into _triMesh
void convertAiMeshToTriMesh(TriMesh* _triMesh, aiMesh* _mesh);
/// converts a polymesh to an aiMesh
bool convertPolyMeshToAiMesh(PolyMesh* _polyMesh, aiMesh* _mesh);
/// converts a trimesh to an aiMesh
bool convertTriMeshToAiMesh(TriMesh* _triMesh, aiMesh* _mesh);
/// add a vertex from _mesh to _polyMesh and stores the index to handle mapping
......
# Include Testing package
if(BUILD_TESTING)
include( ${CMAKE_SOURCE_DIR}/tests/testGenerators.cmake )
# ========================================================================
# ========================================================================
# Tests
# ========================================================================
# ========================================================================
run_single_object_file_mesh_test("assimpplugin" "Plugin-Assimp/cube.xgl" "fileMeshTest.ofs")
run_single_object_file_mesh_test("assimpplugin" "Plugin-Assimp/cube.dae" "fileMeshTest.ofs")
endif()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment