[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39401] branches/soc-2011-pepper/source/ blender/collada: blender extra parameter animation import ( on hold );

[Sukhitha Jayathilake]

Revision: 39401
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39401
Author:   phabtar
Date:     2011-08-14 16:15:41 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
blender extra parameter animation import ( on hold );

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-pepper/source/blender/collada/ExtraHandler.cpp
    branches/soc-2011-pepper/source/blender/collada/ExtraHandler.h

Modified: branches/soc-2011-pepper/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/DocumentImporter.cpp	2011-08-14 16:14:32 UTC (rev 39400)
+++ branches/soc-2011-pepper/source/blender/collada/DocumentImporter.cpp	2011-08-14 16:15:41 UTC (rev 39401)
@@ -116,7 +116,7 @@
 	/** TODO Add error handler (implement COLLADASaxFWL::IErrorHandler */
 	COLLADASaxFWL::Loader loader;
 	COLLADAFW::Root root(&loader, this);
-	ExtraHandler *ehandler = new ExtraHandler(this);
+	ExtraHandler *ehandler = new ExtraHandler(this, &(this->anim_importer));
 	
 	loader.registerExtraDataCallbackHandler(ehandler);
 	

Modified: branches/soc-2011-pepper/source/blender/collada/ExtraHandler.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/ExtraHandler.cpp	2011-08-14 16:14:32 UTC (rev 39400)
+++ branches/soc-2011-pepper/source/blender/collada/ExtraHandler.cpp	2011-08-14 16:15:41 UTC (rev 39401)
@@ -31,9 +31,10 @@
 
 #include "ExtraHandler.h"
 
-ExtraHandler::ExtraHandler(DocumentImporter *dimp) : currentExtraTags(0)
+ExtraHandler::ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp) : currentExtraTags(0)
 {
 	this->dimp = dimp;
+	this->aimp = aimp;
 }
 
 ExtraHandler::~ExtraHandler() {}
@@ -42,6 +43,7 @@
 {
 	// \todo attribute handling for profile tags
 	currentElement = std::string(elementName);
+	//addToSidTree(attributes[0], attributes[1]);
 	return true;
 }
 

Modified: branches/soc-2011-pepper/source/blender/collada/ExtraHandler.h
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/ExtraHandler.h	2011-08-14 16:14:32 UTC (rev 39400)
+++ branches/soc-2011-pepper/source/blender/collada/ExtraHandler.h	2011-08-14 16:15:41 UTC (rev 39401)
@@ -32,8 +32,10 @@
 #include <algorithm> // sort()
 
 #include "COLLADASaxFWLIExtraDataCallbackHandler.h"
+#include "COLLADASaxFWLFilePartLoader.h"
 
 #include "DocumentImporter.h"
+#include "AnimationImporter.h"
 
 /** \brief Handler class for <extra> data, through which different
  * profiles can be handled
@@ -42,7 +44,7 @@
 {
 public:
 	/** Constructor. */
-	ExtraHandler(DocumentImporter *dimp);
+	ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp);
 
 	/** Destructor. */
 	virtual ~ExtraHandler();
@@ -69,6 +71,7 @@
 	
 	/** Handle to DocumentImporter for interface to extra element data saving. */
 	DocumentImporter* dimp;
+	AnimationImporter* aimp;
 	/** Holds Id of element for which <extra> XML elements are handled. */
 	COLLADAFW::UniqueId currentUid;
 	ExtraTags* currentExtraTags;