Changeset 5206 in orxonox.OLD

Timestamp:

Sep 19, 2005, 12:31:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell no more singleton, and ShellInput is now derive from Text correctly

Location:

trunk/src

Files:

• defs/class_id.h (modified) (4 diffs)
• lib/shell/shell.cc (modified) (6 diffs)
• lib/shell/shell.h (modified) (2 diffs)
• lib/shell/shell_buffer.cc (modified) (4 diffs)
• lib/shell/shell_buffer.h (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -81 +81 @@
   CL_WEAPON                     =    0x00120000,
 
-  // subsuper-classes derivations taken : 1, a.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
+  // subsuper-classes derivations taken : 1, a, b.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
 
   // lowest level classes
@@ -110 +110 @@
   CL_RENDER_2D                  =    0x00000f21,
   CL_NULL_ELEMENT_2D            =    0x00000f22,
-  CL_SHELL                      =    0x00000f31,
   CL_SHELL_BUFFER               =    0x00000f32,
 
@@ -160 +159 @@
 
   // graphical stuff (range from 0x00000800 to 0x000009ff)
-  CL_TEXT                       =    0x00000801,
+  CL_TEXT                       =    0x00b01801,
   CL_FONT                       =    0x00000802,
   CL_MATERIAL                   =    0x00000803,
@@ -195 +194 @@
   CL_NUMBER                     =    0x00000b0c,
   CL_FAST_FACTORY               =    0x00000c01,
+  CL_SHELL                      =    0x00000c10,
   CL_SHELL_COMMAND              =    0x00000c11,
   CL_SHELL_COMMAND_CLASS        =    0x00000c12,

trunk/src/lib/shell/shell.cc

@@ -50 +50 @@
   this->setName("Shell");
 
+  // register the shell at the ShellBuffer
+  ShellBuffer::getInstance()->registerShell(this);
+
+
   // Element2D and generals
   this->setAbsCoor2D(3, -400);
@@ -71 +75 @@
 }
 
-Shell* Shell::singletonRef = NULL;
-
 /**
  * standard deconstructor
@@ -85 +87 @@
   // delete the inputLine
   delete this->shellInput;
-
-  Shell::singletonRef = NULL;
+  ShellBuffer::getInstance()->unregisterShell(this);
 }
 
@@ -198 +199 @@
       this->bufferText[i]->setText(NULL, true);
     }
-
-
-    // BUFFER FLUSHING
+  // BUFFER FLUSHING
 }
 
@@ -240 +239 @@
 }
 
-
-
 /**
  * listens for some event
@@ -322 +319 @@
 }
 
-
-
 // void Shell::testI (int i)
 // {

trunk/src/lib/shell/shell.h

@@ -36 +36 @@
 
   public:
+    Shell();
     virtual ~Shell();
-    /** @returns a Pointer to the only object of this Class */
-    inline static Shell* getInstance() { if (!Shell::singletonRef) Shell::singletonRef = new Shell();  return Shell::singletonRef; };
-    /** @returns true if this class is instanciated, false otherwise */
-    inline static bool isInstanciated() { return (Shell::singletonRef == NULL)?false:true; };
 
     void activate();
@@ -75 +72 @@
 
   private:
-    Shell();
-    static Shell*            singletonRef;           //!< The singleton-reference to the only memeber of this class.
 
     // GENERAL

trunk/src/lib/shell/shell_buffer.cc

@@ -33 +33 @@
 {
   ShellBuffer::singletonRef = this;
+  this->shell = NULL;
 
   this->lineCount = 0;
@@ -50 +51 @@
 ShellBuffer::~ShellBuffer ()
 {
-  if (Shell::isInstanciated())
-    delete Shell::getInstance();
+  if (this->shell != NULL)
+    delete this->shell;
 
   this->flushBuffers();
@@ -58 +59 @@
 
   ShellBuffer::singletonRef = NULL;
+}
+
+/**
+ * registers the Shell to the Buffer
+ * @param shell the Shell to register.
+ */
+void ShellBuffer::registerShell(Shell* shell)
+{
+  if (this->shell == NULL)
+    this->shell = shell;
+  else
+    PRINTF(1)("already registered a Shell to the ShellBuffer\n");
+}
+
+/**
+ * unregisters the Shell from the Buffer
+ * @param shell the Shell to unregister.
+ */
+void ShellBuffer::unregisterShell(Shell* shell)
+{
+  if (this->shell == shell)
+    this->shell = NULL;
+  else
+    PRINTF(1)("cannot unregister shell, because it is not registered to the ShellBuffer\n");
 }
 
@@ -150 +175 @@
     this->lineCount++;
     this->buffer->add(addLine);
-    if (Shell::isInstanciated() && Shell::getInstance()->isActive())
-      Shell::getInstance()->printToDisplayBuffer(addLine);
+    if (likely (this->shell != NULL) && unlikely (this->shell->isActive()))
+      this->shell->printToDisplayBuffer(addLine);
 
     if (this->buffer->getSize() > this->bufferSize)

trunk/src/lib/shell/shell_buffer.h

@@ -12 +12 @@
 
 // FORWARD DECLARATION
+class Shell;
 template<class T> class tList;
 template<class T> class tIterator;
@@ -27 +28 @@
   /** @returns true if this class is instanciated, false otherwise */
   inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
+
+  void registerShell(Shell* shell);
+  void unregisterShell(Shell* shell);
 
   // BUFFER //
@@ -54 +58 @@
    tIterator<char>*         bufferIterator;                     //!< An iterator for the Shells main buffer.
 
+   Shell*                   shell;                              //!< the Registered Shell.
    char                     bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
    char                     keepBufferArray[SHELL_BUFFER_SIZE]; //!< a BUFFER to have multi-non-newLine commands be copied into the shell.

trunk/src/story_entities/world.cc

@@ -119 +119 @@
 World::~World ()
 {
-  delete Shell::getInstance();
+  delete this->shell;
   PRINTF(3)("World::~World() - deleting current world\n");
 
@@ -200 +200 @@
 
   /* init the world interface */
-  Shell::getInstance();
+  this->shell = new Shell();
 
   LightManager::getInstance();

trunk/src/story_entities/world.h

@@ -24 +24 @@
 class PilotNode;
 
+class Shell;
 class OggPlayer;
 
@@ -93 +94 @@
   char* path;                         //!< The file from which this world is loaded
 
-
+  Shell*     shell;
   OggPlayer* music;