Changeset 9659 in orxonox.OLD for trunk/src/lib

Timestamp:

Aug 15, 2006, 9:35:58 PM (18 years ago)

Author:

bensch

Message:

some thoughts

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (1 diff)
• lang/new_class_id.cc (copied) (copied from trunk/src/proto/proto_class.cc) (3 diffs)
• lang/new_class_id.h (copied) (copied from trunk/src/proto/proto_class.h) (1 diff)
• lang/type_info.h (added)
• util/smooth.h (modified) (1 diff)
• util/timer.h (modified) (2 diffs)

trunk/src/lib/Makefile.am

@@ -7 +7 @@
                 lang/base_object.cc \
                 lang/class_list.cc \
+                lang/new_class_id.cc \
                 \
                 coord/p_node.cc \

trunk/src/lib/lang/new_class_id.cc

@@ -2 +2 @@
    orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+   Copyright (C) 2006 orx
 
    This program is free software; you can redistribute it and/or modify
@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "new_class_id.h"
+#include <cassert>
+
+ClassIDDeclaration::ClassIDDeclaration(const std::string& name)
+  : _id(-1), _name(name)
+{
+  NewClassID::registerClass(this);
+}
+
+ClassIDDeclaration::~ClassIDDeclaration()
+{
+  NewClassID::unregisterClass(this);
+}
 
 
 
-
+///////////////////////////////////////////////////////////
+//// CLASS ID definiton. //////////////////////////////////
+///////////////////////////////////////////////////////////
 /**
- * standard constructor
- * @todo this constructor is not jet implemented - do it
-*/
-ProtoClass::ProtoClass ()
+ * @brief standard constructor
+ */
+NewClassID::NewClassID ()
+  : _className("")
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
-
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
 }
 
 
 /**
- * standard deconstructor
-*/
-ProtoClass::~ProtoClass ()
+ * @brief standard deconstructor
+ */
+NewClassID::~NewClassID ()
 {
   // delete what has to be deleted here
 }
+
+
+int NewClassID::_idCounter = 0;
+
+//! TODO make access to the idCounter ThreadSafe!
+void NewClassID::registerClass(ClassIDDeclaration* namer)
+{
+  assert (namer->id() != -1 && "Do not register any ClassID's for yourself.");
+
+  namer->_id = NewClassID::_idCounter++;
+}
+
+void NewClassID::unregisterClass(ClassIDDeclaration* namer)
+{
+  // here nothing is done, because Classes cannot be realigned fast.
+}

trunk/src/lib/lang/new_class_id.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
- * @brief Definition of ...
-*/
+ * @file new_class_id.h
+ * @brief Definition of a dynamically allocating ClassID
+ *
+ */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _NEW_CLASS_ID_H
+#define _NEW_CLASS_ID_H
 
-#include "base_object.h"
+#include "type_info.h"
+#include <set>
+#include <string>
 
-// FORWARD DECLARATION
+#define DeclareClass(ClassName) \
+   ClassIDDeclaration ClassID_##ClassName(ClassName)
+
+class ClassIDDeclaration
+{
+  friend class NewClassID;
+public:
+  ClassIDDeclaration(const std::string& name);
+  ~ClassIDDeclaration();
+
+  int id() const { return _id; };
+  const std::string& name() const { return _name; };
+
+private:
+  //! the copy constructor will be hidden.
+  ClassIDDeclaration(const ClassIDDeclaration& definer) {};
+
+private:
+  int                   _id;
+  std::string           _name;
+};
+
+
+//! A class to dynamically allocate ClassID's and support a isA operator
+class NewClassID
+{
+public:
+  NewClassID();
+  ~NewClassID();
 
 
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+  static int classCount() { return _idCounter; };
+  static void registerClass(ClassIDDeclaration* namer);
+  static void unregisterClass(ClassIDDeclaration* namer);
 
- public:
-  ProtoClass();
-  virtual ~ProtoClass();
+private:
+  std::set<ClassIDDeclaration>  _types;
+  std::string                   _className;
+
+  static int                    _idCounter;      //!< A counter, that gives all classes a Unique ClassID. Access to this Variable is to be Thread-Safe.
+};
 
 
- private:
-
-};
-
-#endif /* _PROTO_CLASS_H */
+#endif /* _NEW_CLASS_ID_H */

trunk/src/lib/util/smooth.h

@@ -21 +21 @@
 
   //! A class to handle smoothness of Variables.
-  /** With this smoothing can be achived for many different types of variables.
+  /** 
+   * With this smoothing can be achived for many different types of variables.
    */
   template <typename var_type = float, class iteration_type = LinearIteration<var_type> > class Smooth

trunk/src/lib/util/timer.h

@@ -1 @@
-
 /*!
  * @file timer.h
@@ -33 +32 @@
     double         _lastTime;
     double         _timeStep;
-
 };