v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gltf_o3dgc

pull/972/head
Alexandr Arutjunov 2016-09-10 09:14:28 +03:00
parent d97f00571e
commit 5fe32caa6d
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/CMakeLists.txt
View File

@ -617,6 +617,7 @@ ADD_ASSIMP_IMPORTER( 3MF
D3MFOpcPackage.h D3MFOpcPackage.h
D3MFOpcPackage.cpp D3MFOpcPackage.cpp
) )
SOURCE_GROUP( 3MF FILES ${(3MF_SRCS})
SET( Step_SRCS SET( Step_SRCS

47
code/D3MFImporter.cpp
View File

@ -66,35 +66,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_3MF_IMPORTER #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER
namespace Assimp { namespace Assimp {
namespace D3MF { namespace D3MF {
namespace XmlTag { namespace XmlTag {
static const std::string model = "model";
const std::string model = "model"; static const std::string metadata = "metadata";
const std::string metadata = "metadata"; static const std::string resources = "resources";
const std::string resources = "resources"; static const std::string object = "object";
const std::string object = "object"; static const std::string mesh = "mesh";
const std::string mesh = "mesh"; static const std::string vertices = "vertices";
const std::string vertices = "vertices"; static const std::string vertex = "vertex";
const std::string vertex = "vertex"; static const std::string triangles = "triangles";
const std::string triangles = "triangles"; static const std::string triangle = "triangle";
const std::string triangle = "triangle"; static const std::string x = "x";
const std::string x = "x"; static const std::string y = "y";
const std::string y = "y"; static const std::string z = "z";
const std::string z = "z"; static const std::string v1 = "v1";
const std::string v1 = "v1"; static const std::string v2 = "v2";
const std::string v2 = "v2"; static const std::string v3 = "v3";
const std::string v3 = "v3"; static const std::string id = "id";
const std::string id = "id"; static const std::string name = "name";
const std::string name = "name"; static const std::string type = "type";
const std::string type = "type"; static const std::string build = "build";
const std::string build = "build"; static const std::string item = "item";
const std::string item = "item"; static const std::string objectid = "objectid";
const std::string objectid = "objectid"; static const std::string transform = "transform";
const std::string transform = "transform";
} }