Changeset 7bfc19 for molecuilder/src/World.hpp

Timestamp:

Feb 24, 2010, 4:21:12 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

5bf941

Parents:

01d28a

git-author:

Tillmann Crueger <crueger@…> (02/24/10 15:29:12)

git-committer:

Tillmann Crueger <crueger@…> (02/24/10 16:21:12)

Message:

Made the world solely responsible for creating and destroying atoms.

File:

• molecuilder/src/World.hpp (modified) (3 diffs)

molecuilder/src/World.hpp

@@ -58 +58 @@
   /***** Methods to work with the World *****/
   molecule *createMolecule();
+  atom *createAtom();
+  int registerAtom(atom*);
+  void destroyAtom(atom*);
+  void destroyAtom(int);
 
   ManipulateAtomsProcess* manipulateAtoms(boost::function<void(atom*)>,std::string,AtomDescriptor);
@@ -95 +99 @@
   periodentafel *periode;
   AtomList atoms;
+  int currAtomId; //!< stores the next available Id for atoms
   std::set<molecule*> molecules;
 
@@ -120 +125 @@
   MoleculeListClass *&getMolecules();
 
-  // functions used for the WorldContent template mechanism
-  void registerAtom(atom *theAtom);
-  void unregisterAtom(atom *theAtom);
 private:
-  // this function cleans up anything that cannot be cleaned while the lock is active
-  // at a later point all these cleanups have to be moved to the World Class so the deadlock and
-  // race condition can both be avoided.
-  void destroyLegacy();
-
   MoleculeListClass *molecules_deprecated;
-
-  // this is needed to assign unique IDs to atoms... so far
-  // IDs are not assigned upon Atom creation, so we cannot query the ID
-  // during construction. By using the dummy ID we can make sure all atoms
-  // are actually stored in the map and don't overwrite each other.
-  int dummyId;
 };