Skip to content

Commit

Permalink
Cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
franck-ohayon-sb committed May 20, 2015
1 parent 55dff52 commit 59dd0eb
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 66 deletions.
2 changes: 1 addition & 1 deletion COLLADAMaya/include/COLLADAMayaPhysicSceneExporter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAMaya.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAMaya/include/COLLADAMayaPhysicsExporter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAMaya.
Expand Down
6 changes: 2 additions & 4 deletions COLLADAMaya/include/COLLADAMayaSyntax.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ namespace COLLADAMaya
static const char* PROFILE_COLLADA = "COLLADA";
static const char* PROFILE_MAYA = "OpenCOLLADAMaya";
static const char* PROFILE_MAX = "OpenCOLLADA3dsMax";
static const char* PROFILE_FL4RE = "fl4re";


/** Extra technique parameters. */
static const String PARAMETER_MAYA_ID = "originalMayaNodeId";
static const String PARAMETER_DOUBLE_SIDED = "double_sided";
static const String PARAMETER_SHAPE_TYPE = "shapeType";


/** Empty strings. */
static const String EMPTY_STRING = "";
static const char* EMPTY_CSTRING = "";
Expand Down
13 changes: 0 additions & 13 deletions COLLADAMaya/scripts/.COLLADAMayaVersionInfo.h

This file was deleted.

40 changes: 20 additions & 20 deletions COLLADAMaya/scripts/COLLADAMaya.vcxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions COLLADAMaya/scripts/COLLADAMaya.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
</ClCompile>
<ClCompile Include="..\src\COLLADAMayaAttributeParser.cpp">
<Filter>Source Files\Helpers</Filter>
</ClCompile>
<ClCompile Include="..\src\COLLADAMayaPhysicSceneExporter.cpp">
<Filter>Source Files\Exporters</Filter>
</ClCompile>
Expand Down Expand Up @@ -302,6 +303,7 @@
</ClInclude>
<ClInclude Include="..\include\COLLADAMayaAttributeParser.h">
<Filter>Header Files\Helpers</Filter>
</ClInclude>
<ClInclude Include="..\include\COLLADAMayaPhysicSceneExporter.h">
<Filter>Header Files\Exporters</Filter>
</ClInclude>
Expand Down
2 changes: 1 addition & 1 deletion COLLADAMaya/src/COLLADAMayaPhysicSceneExporter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAMaya.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAMaya/src/COLLADAMayaPhysicsExporter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAMaya.
Expand Down
17 changes: 0 additions & 17 deletions COLLADAMaya/src/COLLADAMayaVisualSceneExporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -662,12 +662,6 @@ namespace COLLADAMaya
return false;
}

///////TEST
MFnDagNode element(transformNode);
MString elementName;
elementName = element.name();
///////TEST

// Get the transforms local translation
MFnTransform fn ( transformNode );
mTransformMatrix = fn.transformation();
Expand All @@ -680,12 +674,6 @@ namespace COLLADAMaya
}
}

///////TEST
double resultFinal[4][4];
mTransformMatrix.asMatrix().get(resultFinal);
MVector translation = mTransformMatrix.translation(MSpace::kTransform);
///////TEST

// Skins being exported from maya need to have the bindpose matrix
// subtracted from the instance matrix.
bool oneSkinAlready = false;
Expand Down Expand Up @@ -729,11 +717,6 @@ namespace COLLADAMaya
//---------------------------------------------------------------
void VisualSceneExporter::exportDecomposedTransform()
{
///////TEST
double resultFinal[4][4];
mTransformMatrix.asMatrix().get(resultFinal);
///////TEST

MVector translation = mTransformMatrix.translation ( MSpace::kTransform );
MPoint rotatePivotTranslation = mTransformMatrix.rotatePivotTranslation ( MSpace::kTransform );
MPoint rotatePivot = mTransformMatrix.rotatePivot ( MSpace::kTransform, NULL );
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAStreamWriter/include/COLLADASWInstanceRigidBody.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAStreamWriter/src/COLLADASWInstancePhysicsModel.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAStreamWriter/src/COLLADASWInstanceRigidBody.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAStreamWriter/src/COLLADASWLibraryPhysicsModels.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down
2 changes: 1 addition & 1 deletion COLLADAStreamWriter/src/COLLADASWLibraryPhysicsScenes.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2008-2009 NetAllied Systems GmbH
Copyright (c) 2015 Starbreeze
This file is part of COLLADAStreamWriter.
Expand Down

0 comments on commit 59dd0eb

Please sign in to comment.