simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27863

Modified Files:
      Tag: projectx
	sceneimporter.h 
Log Message:
merge from HEAD


Index: sceneimporter.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneimporter.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** sceneimporter.h	5 Dec 2005 21:21:17 -0000	1.1
--- sceneimporter.h	17 Jun 2007 08:00:26 -0000	1.1.4.1
***************
*** 30,38 ****
  {
  class BaseNode;
  
  class SceneImporter : public zeitgeist::Leaf
  {
  public:
!     SceneImporter() : zeitgeist::Leaf() {}
      virtual ~SceneImporter() {};
  
--- 30,39 ----
  {
  class BaseNode;
+ class SceneDict;
  
  class SceneImporter : public zeitgeist::Leaf
  {
  public:
!     SceneImporter() : zeitgeist::Leaf(), mSceneDict(0) {}
      virtual ~SceneImporter() {};
  
***************
*** 46,49 ****
--- 47,57 ----
                              boost::shared_ptr<BaseNode> root,
                              boost::shared_ptr<zeitgeist::ParameterList> parameter) = 0;
+ 
+ 
+     /** sets up the reference to the SceneDict instance */
+     void SetSceneDict(SceneDict* dict) { mSceneDict = dict; }
+ 
+ protected:
+     SceneDict* mSceneDict;
  };