提交 1a2380b7 编写于 作者: R Rémi Arnaud

Merge pull request #414 from fl4re/Fix/Version

Added Revision and Version in <authoring_tool>
#ifndef __COLLADABU_VERSIONINFO_H__
#define __COLLADABU_VERSIONINFO_H__
namespace COLLADABU
{
// CURRENT_REVISION = MajorVersion.MinorVersion.Revision
//
const String CURRENT_REVISION = "1.6.developer_version";
}
#endif // __COLLADABU_VERSIONINFO_H__
......@@ -1001,6 +1001,7 @@
<ClInclude Include="..\include\COLLADABUStringUtils.h" />
<ClInclude Include="..\include\COLLADABUURI.h" />
<ClInclude Include="..\include\COLLADABUUtils.h" />
<ClInclude Include="..\include\COLLADABUVersionInfo.h" />
<ClInclude Include="..\include\Math\COLLADABUMathMatrix3.h" />
<ClInclude Include="..\include\Math\COLLADABUMathMatrix4.h" />
<ClInclude Include="..\include\Math\COLLADABUMathPrerequisites.h" />
......
......@@ -127,5 +127,8 @@
<ClInclude Include="..\..\Externals\UTF\include\ConvertUTF.h">
<Filter>Header Files\UTF</Filter>
</ClInclude>
<ClInclude Include="..\include\COLLADABUVersionInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -21,8 +21,6 @@ namespace COLLADAMax
static const TCHAR* PLUGIN_VERSION_TCHAR;
static const String PLUGIN_VERSION_STRING;
static const String REVISION_STRING;
static const String PLATFORM_STRING;
static const String CONFIGURATION_STRING;
static const TCHAR* FATALERROR;
......
#include "COLLADAMaxStableHeaders.h"
#include "COLLADAMaxCOLLADAPlugin.h"
#include "COLLADAMaxVersionInfo.h"
#include "COLLADABUVersionInfo.h"
namespace COLLADAMax
{
......@@ -16,10 +16,7 @@ namespace COLLADAMax
const TCHAR* COLLADAPlugin::PLUGIN_VERSION_TCHAR = __T("Version: 1.4.1");
const String COLLADAPlugin::PLUGIN_VERSION_STRING = "Version: 1.4.1";
const String COLLADAPlugin::REVISION_STRING = (CURRENT_REVISION.empty() ? "" : String("Revision: ") + CURRENT_REVISION);
const String COLLADAPlugin::PLATFORM_STRING = String("Platform: ") + CURRENT_PLATFORM;
const String COLLADAPlugin::CONFIGURATION_STRING = String("Configuration: ") + CURRENT_CONFIGURATION;
const String COLLADAPlugin::REVISION_STRING = (COLLADABU::CURRENT_REVISION.empty() ? "" : String("Revision: ") + COLLADABU::CURRENT_REVISION);
const TCHAR* COLLADAPlugin::FATALERROR = __T("Fatal Error: exception caught.");
......
......@@ -35,6 +35,8 @@
#include "COLLADASWScene.h"
#include "COLLADASWConstants.h"
#include "COLLADABUVersionInfo.h"
#include <max.h>
namespace COLLADAMax
......@@ -42,13 +44,17 @@ namespace COLLADAMax
const String DocumentExporter::SCENE_ID = "MaxScene";
const String DocumentExporter::PHYSIC_SCENE_ID = "PhysicMaxScene";
std::size_t foundLast = COLLADABU::CURRENT_REVISION.find_last_of(".");
std::size_t foundFirst = COLLADABU::CURRENT_REVISION.find_first_of(".");
String versionMajor = COLLADABU::CURRENT_REVISION.substr(0, foundFirst);
String versionMinor = COLLADABU::CURRENT_REVISION.substr(foundFirst + 1, foundLast - foundFirst - 1);
const String DocumentExporter::AUTHORING_TOOL = String("OpenCOLLADA for 3ds Max") +
(COLLADAPlugin::PLUGIN_VERSION_STRING.empty() ? "" : String("; ") + COLLADAPlugin::PLUGIN_VERSION_STRING) +
(COLLADAPlugin::REVISION_STRING.empty() ? "" : String("; ") + COLLADAPlugin::REVISION_STRING) +
String("; ") + COLLADAPlugin::PLATFORM_STRING +
String("; ") + COLLADAPlugin::CONFIGURATION_STRING;
(COLLADAPlugin::PLUGIN_VERSION_STRING.empty() ? "" : String("; ") + COLLADAPlugin::PLUGIN_VERSION_STRING) +
(COLLADABU::CURRENT_REVISION.empty() ? "" : String("; ") + String("Version: ") + versionMajor + "." + versionMinor) +
(COLLADABU::CURRENT_REVISION.empty() ? "" : String("; ") + String("Revision: ") + COLLADABU::CURRENT_REVISION.substr(foundLast + 1));
//---------------------------------------------------------------
DocumentExporter::DocumentExporter ( Interface * i, const NativeString &filepath, COLLADABU::IDList& xRefExportFileNames, bool exportOnlySelected )
......
......@@ -38,6 +38,7 @@
95133F641AA8BA51003AC4E2 /* COLLADASWInstanceRigidBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95133F601AA8BA51003AC4E2 /* COLLADASWInstanceRigidBody.cpp */; };
95133F651AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsModels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95133F611AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsModels.cpp */; };
95133F661AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsScenes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95133F621AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsScenes.cpp */; };
9526B2551CABD54B00373794 /* COLLADABUVersionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9526B2541CABD54B00373794 /* COLLADABUVersionInfo.h */; };
A5155E1619F795D800D5D4DC /* COLLADAMaya.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = D2AAC09D05546B4700DB518D /* COLLADAMaya.bundle */; };
CE0B3D8A0F56AF48004F8570 /* COLLADASWAsset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE0B3D570F56AF48004F8570 /* COLLADASWAsset.cpp */; };
CE0B3D8B0F56AF48004F8570 /* COLLADASWBaseElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE0B3D580F56AF48004F8570 /* COLLADASWBaseElement.cpp */; };
......@@ -346,7 +347,6 @@
CE3E66A10FD54BD4003D1AD2 /* COLLADAFWMorphController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3E66A00FD54BD4003D1AD2 /* COLLADAFWMorphController.h */; };
CE3E66A30FD54BEA003D1AD2 /* COLLADAFWMorphController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3E66A20FD54BEA003D1AD2 /* COLLADAFWMorphController.cpp */; };
CE3E66B60FD54FA7003D1AD2 /* COLLADAFWSkinController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE784F2F0FB5AAC100F2F8D6 /* COLLADAFWSkinController.cpp */; };
CE4A34C90F98E47A00E32945 /* COLLADAMayaVersionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4A34C80F98E47A00E32945 /* COLLADAMayaVersionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
CE55B8AE1701A4080038F432 /* COLLADAFWPolylist.h in Headers */ = {isa = PBXBuildFile; fileRef = CE55B8AD1701A4080038F432 /* COLLADAFWPolylist.h */; };
CE615FD81020DC3D00481492 /* MathMLASTArithmeticExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = CE79D1281020BD9A00A3A027 /* MathMLASTArithmeticExpression.h */; };
CE615FD91020DC3D00481492 /* MathMLASTBinaryComparisionExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = CE79D1291020BD9A00A3A027 /* MathMLASTBinaryComparisionExpression.h */; };
......@@ -962,6 +962,7 @@
95133F601AA8BA51003AC4E2 /* COLLADASWInstanceRigidBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWInstanceRigidBody.cpp; path = ../COLLADAStreamWriter/src/COLLADASWInstanceRigidBody.cpp; sourceTree = "<group>"; };
95133F611AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsModels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWLibraryPhysicsModels.cpp; path = ../COLLADAStreamWriter/src/COLLADASWLibraryPhysicsModels.cpp; sourceTree = "<group>"; };
95133F621AA8BA51003AC4E2 /* COLLADASWLibraryPhysicsScenes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWLibraryPhysicsScenes.cpp; path = ../COLLADAStreamWriter/src/COLLADASWLibraryPhysicsScenes.cpp; sourceTree = "<group>"; };
9526B2541CABD54B00373794 /* COLLADABUVersionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADABUVersionInfo.h; path = ../COLLADABaseUtils/include/COLLADABUVersionInfo.h; sourceTree = "<group>"; };
CE0B3D570F56AF48004F8570 /* COLLADASWAsset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWAsset.cpp; path = ../COLLADAStreamWriter/src/COLLADASWAsset.cpp; sourceTree = SOURCE_ROOT; };
CE0B3D580F56AF48004F8570 /* COLLADASWBaseElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWBaseElement.cpp; path = ../COLLADAStreamWriter/src/COLLADASWBaseElement.cpp; sourceTree = SOURCE_ROOT; };
CE0B3D590F56AF48004F8570 /* COLLADASWBaseInputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADASWBaseInputElement.cpp; path = ../COLLADAStreamWriter/src/COLLADASWBaseInputElement.cpp; sourceTree = SOURCE_ROOT; };
......@@ -1270,7 +1271,6 @@
CE3E668E0FD54A76003D1AD2 /* pcre_try_flipped.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pcre_try_flipped.c; path = ../Externals/pcre/src/pcre_try_flipped.c; sourceTree = SOURCE_ROOT; };
CE3E66A00FD54BD4003D1AD2 /* COLLADAFWMorphController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADAFWMorphController.h; path = ../COLLADAFramework/include/COLLADAFWMorphController.h; sourceTree = SOURCE_ROOT; };
CE3E66A20FD54BEA003D1AD2 /* COLLADAFWMorphController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = COLLADAFWMorphController.cpp; path = ../COLLADAFramework/src/COLLADAFWMorphController.cpp; sourceTree = SOURCE_ROOT; };
CE4A34C80F98E47A00E32945 /* COLLADAMayaVersionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADAMayaVersionInfo.h; path = include/COLLADAMayaVersionInfo.h; sourceTree = "<group>"; };
CE55B8AD1701A4080038F432 /* COLLADAFWPolylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COLLADAFWPolylist.h; path = ../COLLADAFramework/include/COLLADAFWPolylist.h; sourceTree = "<group>"; };
CE6095210E93CD6B007F776B /* libCOLLADAStreamWriter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCOLLADAStreamWriter.a; sourceTree = BUILT_PRODUCTS_DIR; };
CE615FD01020DBF500481492 /* libMathMLSolver.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMathMLSolver.a; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -2430,6 +2430,7 @@
CE72910510AC800C00AE5662 /* include */ = {
isa = PBXGroup;
children = (
9526B2541CABD54B00373794 /* COLLADABUVersionInfo.h */,
87E0A7BD1BFA55CF00FA6AF2 /* COLLADAMayaPhysXXML.h */,
871C5B391BCEC138008B84FF /* COLLADAMayaPhysXExporter.h */,
870E79C81B17203600590717 /* COLLADAMayaPhysicsSceneExporter.h */,
......@@ -2479,7 +2480,6 @@
CE0B3ED00F56AFD8004F8570 /* COLLADAMayaStableHeaders.h */,
CE0B3ED10F56AFD8004F8570 /* COLLADAMayaSyntax.h */,
CE0B3ED20F56AFD8004F8570 /* COLLADAMayaTangentPoint.h */,
CE4A34C80F98E47A00E32945 /* COLLADAMayaVersionInfo.h */,
CE0B3ED30F56AFD8004F8570 /* COLLADAMayaVisualSceneExporter.h */,
);
name = include;
......@@ -3473,6 +3473,7 @@
CE0B3EEB0F56AFD8004F8570 /* COLLADAMayaExportOptions.h in Headers */,
CE0B3EEC0F56AFD8004F8570 /* COLLADAMayaFileTranslator.h in Headers */,
95133F5E1AA8BA37003AC4E2 /* COLLADASWLibraryPhysicsScenes.h in Headers */,
9526B2551CABD54B00373794 /* COLLADABUVersionInfo.h in Headers */,
CE0B3EEE0F56AFD8004F8570 /* COLLADAMayaGeometryExporter.h in Headers */,
CE0B3EF00F56AFD8004F8570 /* COLLADAMayaGeometryPolygonExporter.h in Headers */,
CE0B3EF10F56AFD8004F8570 /* COLLADAMayaHwShaderExporter.h in Headers */,
......@@ -3502,7 +3503,6 @@
CE0B3F0C0F56AFD8004F8570 /* COLLADAMayaVisualSceneExporter.h in Headers */,
879D18E01AE8070F005C246C /* COLLADAMayaAttributeParser.h in Headers */,
95133F5D1AA8BA37003AC4E2 /* COLLADASWLibraryPhysicsModels.h in Headers */,
CE4A34C90F98E47A00E32945 /* COLLADAMayaVersionInfo.h in Headers */,
CE7D40150FF1308D00849CFA /* COLLADAMayaBaseAnimation.h in Headers */,
95133F521AA8B986003AC4E2 /* COLLADAMayaPhysicsExporter.h in Headers */,
CE7D40160FF1308E00849CFA /* COLLADAMayaMayaTransform.h in Headers */,
......
......@@ -17,14 +17,12 @@
#define __COLLADA_MAYA_SYNTAX_H__
#include "COLLADAMayaPrerequisites.h"
#include "COLLADABUVersionInfo.h"
namespace COLLADAMaya
{
// COLLADA NetAllied Systems
static const char* TRANSLATOR_VENDOR = "NetAllied Systems GmbH";
static const char* TRANSLATOR_VERSION = "1.3.0";
static const char* USERNAME = "USERNAME";
static const char* USER = "USER";
......
#ifndef __COLLADAMAYA_VERSIONINFO_H__
#define __COLLADAMAYA_VERSIONINFO_H__
#include "COLLADAMayaPrerequisites.h"
namespace COLLADAMaya
{
const String CURRENT_SHA1 = "undefined";
const String CURRENT_REVISION = "developer version";
}
#endif // __COLLADAMAYA_VERSIONINFO_H__
......@@ -3536,7 +3536,6 @@ copy "$(ProjectDir)*.mel" "%25MAYA_PATH2012_X64%25\scripts\others"
<ClInclude Include="..\include\COLLADAMayaStableHeaders.h" />
<ClInclude Include="..\include\COLLADAMayaSyntax.h" />
<ClInclude Include="..\include\COLLADAMayaTangentPoint.h" />
<ClInclude Include="..\include\COLLADAMayaVersionInfo.h" />
<ClInclude Include="..\include\COLLADAMayaVisualSceneExporter.h" />
</ItemGroup>
<ItemGroup>
......
......@@ -328,8 +328,5 @@
<ClInclude Include="..\include\COLLADAMayaPhysXXML.h">
<Filter>Header Files\Exporters</Filter>
</ClInclude>
<ClInclude Include="..\include\COLLADAMayaVersionInfo.h">
<Filter>Header Files\Utils</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -3,8 +3,8 @@ REM This script will replace undefined SHA1 with the right one into the input f
set "TEMP_FILE=temp.h"
set "INPUT_FILE=..\include\COLLADAMayaVersionInfo.h"
set CURRENT_SHA1="CURRENT_SHA1"
set "INPUT_FILE=..\..\COLLADABaseUtils\include\COLLADABUVersionInfo.h"
set CURRENT_REV="CURRENT_REVISION"
REM GET GIT SHA1
......@@ -13,7 +13,7 @@ FOR /f %%A in ('git describe --always') do set SHA=%%A
REM SEARCH FOR STRING TO CHANGED
For /f "tokens=1,2,3,4,5 delims= " %%A in (%INPUT_FILE%) do (
if "%%C"==%CURRENT_SHA1% (
if "%%C"==%CURRENT_REV% (
set SEARCHED_STRING="%%E"
)
)
......
......@@ -37,7 +37,8 @@
#include "COLLADAMayaExportOptions.h"
#include "COLLADAMayaSyntax.h"
#include "COLLADAMayaReferenceManager.h"
#include "COLLADAMayaVersionInfo.h"
#include "COLLADABUVersionInfo.h"
#include "COLLADASWAsset.h"
#include "COLLADASWScene.h"
......@@ -297,41 +298,9 @@ namespace COLLADAMaya
}
//---------------------------------------------------------------
class MayaAsset : public COLLADASW::Asset
{
public:
MayaAsset(COLLADASW::StreamWriter* sw)
: COLLADASW::Asset(sw)
{}
protected:
virtual void addExtra() override
{
mSW->openElement(COLLADASW::CSWC::CSW_ELEMENT_EXTRA);
{
mSW->openElement(COLLADASW::CSWC::CSW_ELEMENT_TECHNIQUE);
mSW->appendAttribute(COLLADASW::CSWC::CSW_ATTRIBUTE_PROFILE, COLLADAMaya::PROFILE_MAYA);
{
mSW->openElement(COLLADASW::CSWC::CSW_ELEMENT_PLUGIN_VERSION);
mSW->appendValues(COLLADAMaya::CURRENT_REVISION);
mSW->closeElement();
if (COLLADAMaya::CURRENT_SHA1.compare("undefined") != 0)
{
mSW->openElement(COLLADASW::CSWC::CSW_ELEMENT_SHA1);
mSW->appendValues(COLLADAMaya::CURRENT_SHA1);
mSW->closeElement();
}
}
mSW->closeElement();
}
mSW->closeElement();
}
};
void DocumentExporter::exportAsset()
void DocumentExporter::exportAsset()
{
MayaAsset asset ( &mStreamWriter );
COLLADASW::Asset asset(&mStreamWriter);
// Add contributor information
// Set the author
......@@ -355,45 +324,53 @@ namespace COLLADAMaya
sourceFileUri.setScheme ( COLLADASW::URI::SCHEME_FILE );
asset.getContributor().mSourceData = sourceFileUri.getURIString();
}
std::size_t foundLast = COLLADABU::CURRENT_REVISION.find_last_of(".");
std::size_t foundFirst = COLLADABU::CURRENT_REVISION.find_first_of(".");
String versionMajor = COLLADABU::CURRENT_REVISION.substr(0, foundFirst);
String versionMinor = COLLADABU::CURRENT_REVISION.substr(foundFirst + 1, foundLast - foundFirst -1 );
asset.getContributor().mAuthoringTool = AUTHORING_TOOL_NAME + MGlobal::mayaVersion().asChar();
asset.getContributor().mAuthoringTool = AUTHORING_TOOL_NAME + MGlobal::mayaVersion().asChar() +
(COLLADABU::CURRENT_REVISION.empty() ? "" : String("; ") + String("Version: ") + versionMajor + "." + versionMinor) +
(COLLADABU::CURRENT_REVISION.empty() ? "" : String("; ") + String("Revision: ") + COLLADABU::CURRENT_REVISION.substr(foundLast + 1));
// comments
MString optstr = MString("\n\t\t\tColladaMaya export options: ")
+ "\n\t\t\tbakeTransforms=" + ExportOptions::bakeTransforms()
+ ";relativePaths=" + ExportOptions::relativePaths()
+ ";preserveSourceTree=" + ExportOptions::preserveSourceTree()
+ ";copyTextures=" + ExportOptions::copyTextures()
+ ";exportTriangles=" + ExportOptions::exportTriangles()
+ ";exportCgfxFileReferences=" + ExportOptions::exportCgfxFileReferences()
+ ";\n\t\t\tisSampling=" + ExportOptions::isSampling()
+ ";curveConstrainSampling=" + ExportOptions::curveConstrainSampling()
+ ";removeStaticCurves=" + ExportOptions::removeStaticCurves()
+ ";preserveSourceTree=" + ExportOptions::preserveSourceTree()
+ ";copyTextures=" + ExportOptions::copyTextures()
+ ";exportTriangles=" + ExportOptions::exportTriangles()
+ ";exportCgfxFileReferences=" + ExportOptions::exportCgfxFileReferences()
+ ";\n\t\t\tisSampling=" + ExportOptions::isSampling()
+ ";curveConstrainSampling=" + ExportOptions::curveConstrainSampling()
+ ";removeStaticCurves=" + ExportOptions::removeStaticCurves()
+ ";exportPhysics=" + ExportOptions::exportPhysics()
+ ";exportConvexMeshGeometries=" + ExportOptions::exportConvexMeshGeometries()
+ ";exportPolygonMeshes=" + ExportOptions::exportPolygonMeshes()
+ ";exportLights=" + ExportOptions::exportLights()
+ ";\n\t\t\texportCameras=" + ExportOptions::exportCameras()
+ ";exportJointsAndSkin=" + ExportOptions::exportJointsAndSkin()
+ ";exportAnimations=" + ExportOptions::exportAnimations()
+ ";exportOptimizedBezierAnimation=" + ExportOptions::exportOptimizedBezierAnimations()
+ ";exportInvisibleNodes=" + ExportOptions::exportInvisibleNodes()
+ ";exportDefaultCameras=" + ExportOptions::exportDefaultCameras()
+ ";\n\t\t\texportTexCoords=" + ExportOptions::exportTexCoords()
+ ";exportNormals=" + ExportOptions::exportNormals()
+ ";exportNormalsPerVertex=" + ExportOptions::exportNormalsPerVertex()
+ ";exportVertexColors=" + ExportOptions::exportVertexColors()
+ ";exportVertexColorsPerVertex=" + ExportOptions::exportVertexColorsPerVertex()
+ ";\n\t\t\texportTexTangents=" + ExportOptions::exportTexTangents()
+ ";exportTangents=" + ExportOptions::exportTangents()
+ ";exportReferencedMaterials=" + ExportOptions::exportReferencedMaterials()
+ ";exportMaterialsOnly=" + ExportOptions::exportMaterialsOnly()
+ ";\n\t\t\texportXRefs=" + ExportOptions::exportXRefs()
+ ";dereferenceXRefs=" + ExportOptions::dereferenceXRefs()
+ ";exportCameraAsLookat=" + ExportOptions::exportCameraAsLookat()
+ ";cameraXFov=" + ExportOptions::cameraXFov()
+ ";cameraYFov=" + ExportOptions::cameraYFov()
+ ";doublePrecision=" + ExportOptions::doublePrecision () + "\n\t\t";
+ ";exportConvexMeshGeometries=" + ExportOptions::exportConvexMeshGeometries()
+ ";exportPolygonMeshes=" + ExportOptions::exportPolygonMeshes()
+ ";exportLights=" + ExportOptions::exportLights()
+ ";\n\t\t\texportCameras=" + ExportOptions::exportCameras()
+ ";exportJointsAndSkin=" + ExportOptions::exportJointsAndSkin()
+ ";exportAnimations=" + ExportOptions::exportAnimations()
+ ";exportOptimizedBezierAnimation=" + ExportOptions::exportOptimizedBezierAnimations()
+ ";exportInvisibleNodes=" + ExportOptions::exportInvisibleNodes()
+ ";exportDefaultCameras=" + ExportOptions::exportDefaultCameras()
+ ";\n\t\t\texportTexCoords=" + ExportOptions::exportTexCoords()
+ ";exportNormals=" + ExportOptions::exportNormals()
+ ";exportNormalsPerVertex=" + ExportOptions::exportNormalsPerVertex()
+ ";exportVertexColors=" + ExportOptions::exportVertexColors()
+ ";exportVertexColorsPerVertex=" + ExportOptions::exportVertexColorsPerVertex()
+ ";\n\t\t\texportTexTangents=" + ExportOptions::exportTexTangents()
+ ";exportTangents=" + ExportOptions::exportTangents()
+ ";exportReferencedMaterials=" + ExportOptions::exportReferencedMaterials()
+ ";exportMaterialsOnly=" + ExportOptions::exportMaterialsOnly()
+ ";\n\t\t\texportXRefs=" + ExportOptions::exportXRefs()
+ ";dereferenceXRefs=" + ExportOptions::dereferenceXRefs()
+ ";exportCameraAsLookat=" + ExportOptions::exportCameraAsLookat()
+ ";cameraXFov=" + ExportOptions::cameraXFov()
+ ";cameraYFov=" + ExportOptions::cameraYFov()
+ ";doublePrecision=" + ExportOptions::doublePrecision() + "\n\t\t";
asset.getContributor().mComments = optstr.asChar();
// Up axis
......
......@@ -17,7 +17,6 @@
#include "COLLADAMayaPrerequisites.h"
#include "COLLADAMayaPlatform.h"
#include "COLLADAMayaSyntax.h"
#include "COLLADAMayaVersionInfo.h"
#include "COLLADAMayaFileTranslator.h"
#include "COLLADAMayaDocumentExporter.h"
#include "COLLADAMayaExportOptions.h"
......@@ -30,6 +29,8 @@
#include "COLLADASWException.h"
#include "COLLADABUVersionInfo.h"
#include <time.h>
#include <maya/MFnPlugin.h>
......@@ -82,17 +83,9 @@
std::ostringstream stream;
stream << MAYA_API_VERSION;
COLLADAMaya::String revision ( COLLADAMaya::TRANSLATOR_VERSION );
revision += "." + COLLADAMaya::CURRENT_REVISION;
if (COLLADAMaya::CURRENT_SHA1.compare("undefined") != 0)
{
revision += "__sha1__" + COLLADAMaya::CURRENT_SHA1;
}
MFnPlugin plugin ( obj,
COLLADAMaya::TRANSLATOR_VENDOR,
revision.c_str (),
COLLADABU::CURRENT_REVISION.c_str(),
stream.str ().c_str () );
// --------------------------------------------------------------
......
......@@ -71,3 +71,7 @@ Directories
OpenCOLLADA Tools
You may download binaires of OpenCOLLADA tools [here](https://github.com/KhronosGroup/OpenCOLLADA/wiki/OpenCOLLADA-Tools).
Version/Revision
----------------
Plugin version number and Plugin Revision information have been added in <authoring_tool> element
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册