[simspark-cvs] simspark/spark/oxygen/sceneserver scenedict.cpp, 1.1, 1.2 scenedict.h, 1.1, 1.2 sceneimporter.h, 1.1, 1.2 sceneserver.cpp, 1.3, 1.4

[Markus R. <rol...@us...>]

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

Modified Files:
	sceneimporter.h sceneserver.cpp 
Added Files:
	scenedict.cpp scenedict.h 
Log Message:


--- NEW FILE: scenedict.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: scenedict.h,v 1.2 2007/05/17 17:49:23 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef OXYGEN_SCENEDICT_H
#define OXYGEN_SCENEDICT_H

#include <zeitgeist/leaf.h>
#include <map>

namespace oxygen
{

class SceneDict
{
public:
    struct FileRef
    {
    public:
        std::string fname;
        unsigned int line;

    public:
        FileRef(const std::string& f = std::string(), unsigned int l = 0)
            : fname(f), line(l)
        {
        }
    };

    typedef std::map<boost::weak_ptr<zeitgeist::Leaf>, FileRef> TDictionary;

public:
    static SceneDict& GetInstance();

    const FileRef* Lookup(boost::weak_ptr<zeitgeist::Leaf> leaf);
    void Insert(boost::weak_ptr<zeitgeist::Leaf> leaf, const FileRef& ref);
    void Clear();

private:
    SceneDict();

protected:
    TDictionary mDictionary;
};

} // namespace oxygen

#endif // OXYGEN_SCENEDICT_H

Index: sceneserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneserver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sceneserver.cpp	15 Mar 2007 07:26:28 -0000	1.3
--- sceneserver.cpp	17 May 2007 17:49:23 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
  #include "scene.h"
  #include "sceneimporter.h"
+ #include "scenedict.h"
  #include <oxygen/physicsserver/world.h>
  #include <oxygen/physicsserver/space.h>
***************
*** 215,218 ****
--- 216,221 ----
                  shared_static_cast<SceneImporter>(*iter);
  
+             importer->SetSceneDict(&SceneDict::GetInstance());
+ 
              GetLog()->Debug()
                  << "(SceneServer) trying importer " << importer->GetName() << std::endl;

--- NEW FILE: scenedict.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: scenedict.cpp,v 1.2 2007/05/17 17:49:23 rollmark Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/sceneserver/scenedict.h>

using namespace boost;
using namespace oxygen;
using namespace zeitgeist;

SceneDict::SceneDict()
{
}

SceneDict& SceneDict::GetInstance()
{
    static SceneDict theInstance;
    return theInstance;
}

const SceneDict::FileRef* SceneDict::Lookup(boost::weak_ptr<zeitgeist::Leaf> leaf)
{
    if (leaf.expired())
        {
            return 0;
        }

    TDictionary::const_iterator iter = mDictionary.find(leaf);
    if (iter == mDictionary.end())
        {
            return 0;
        }

    return &((*iter).second);
}

void SceneDict::Insert(boost::weak_ptr<zeitgeist::Leaf> leaf, const FileRef& ref)
{
    if (leaf.expired())
        {
            return;
        }

    mDictionary[leaf] = ref;
}

void SceneDict::Clear()
{
    mDictionary.clear();
}

Index: sceneimporter.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneimporter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sceneimporter.h	5 Dec 2005 21:21:17 -0000	1.1
--- sceneimporter.h	17 May 2007 17:49:23 -0000	1.2
***************
*** 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;
  };