https://github.com/KhronosGroup/glTF/issues/229

KhronosGroup · May 13, 2014 · d97096c · d97096c
1 parent 1c212a8
commit d97096c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/converter/COLLADA2GLTF/COLLADA2GLTFWriter.cpp b/converter/COLLADA2GLTF/COLLADA2GLTFWriter.cpp
@@ -99,12 +99,14 @@ namespace GLTF
 	//--------------------------------------------------------------------
 	bool COLLADA2GLTFWriter::writeGlobalAsset( const COLLADAFW::FileInfo* globalAsset ) {
         GLTFAsset* asset = this->_asset.get();
-        shared_ptr<JSONObject> assetObject = asset->root()->createObjectIfNeeded("asset");
+        shared_ptr<JSONObject> assetObject = asset->root()->createObjectIfNeeded(kAsset);
         std::string version = "collada2gltf@"+std::string(g_GIT_SHA1);
+
         assetObject->setString("generator",version);
-        //shared_ptr<JSONObject> assetExtras = assetObject->createObjectIfNeeded("extras");
         assetObject->setBool(kPremultipliedAlpha, CONFIG_BOOL(asset, kPremultipliedAlpha));
-
+        assetObject->setString(kProfile, asset->profile()->id());
+        assetObject->setDouble(kVersion, glTFVersion);
+
         return true;
 	}
 

diff --git a/converter/COLLADA2GLTF/GLTF/GLTFAsset.cpp b/converter/COLLADA2GLTF/GLTF/GLTFAsset.cpp
@@ -395,7 +395,6 @@ namespace GLTF
     void GLTFAsset::prepareForProfile(shared_ptr<GLTFProfile> profile) {
         this->_profile = profile;
         this->_root = shared_ptr <GLTF::JSONObject> (new GLTF::JSONObject());
-        this->_root->setString(kProfile, profile->id());
         this->_root->createObjectIfNeeded(kNodes);
 
         this->_writer.initWithPath(this->getOutputFilePath().c_str());

diff --git a/converter/COLLADA2GLTF/GLTF/GLTFTypesAndConstants.h b/converter/COLLADA2GLTF/GLTF/GLTFTypesAndConstants.h
@@ -29,6 +29,8 @@
 
 #define EXPORT_MATERIALS_AS_EFFECTS 1
 
+const float glTFVersion = 0.6;
+
 const std::string kCount = "count";
 const std::string kByteOffset = "byteOffset";
 const std::string kByteStride = "byteStride";
@@ -60,6 +62,8 @@ const std::string kValues = "values";
 const std::string kValue = "value";
 const std::string kPremultipliedAlpha = "premultipliedAlpha";
 const std::string kProfile = "profile";
+const std::string kVersion = "version";
+const std::string kAsset = "asset";
 const std::string kNodes = "nodes";
 const std::string kMeshes = "meshes";
 const std::string kAccessors = "accessors";