Changeset 3543 in orxonox.OLD for orxonox/trunk/src/glmenu

Timestamp:

Mar 14, 2005, 10:14:41 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: some more classes now destroy themselves via virtual-destructors and call to predecessing destroy-function
also made
#include "stdincl.h" out of unnecessary h-files, so we got faster compile time.

Location:

orxonox/trunk/src/glmenu

Files:

• glmenu_imagescreen.cc (modified) (3 diffs)
• glmenu_imagescreen.h (modified) (2 diffs)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -19 +19 @@
 #include "glmenu_imagescreen.h"
 
+#include "stdincl.h"
 #include "material.h"
 
@@ -27 +28 @@
 GLMenuImageScreen* GLMenuImageScreen::getInstance()
 {
-  if( singletonRef == NULL)
+  if(!singletonRef)
     singletonRef = new GLMenuImageScreen ();
   return singletonRef;
@@ -45 +46 @@
 /**
    \brief standard deconstructor
+*/
+GLMenuImageScreen::~GLMenuImageScreen() 
+{
+  this->destroy();
+}
+
+/**
+   \brief deletes all alocated Memory and also deletes everything from the Class this one is erived from
 
    \todo this deconstructor is not jet implemented - do it
 */
-GLMenuImageScreen::~GLMenuImageScreen() 
+void GLMenuImageScreen::destroy(void)
 {
   if (backMat)
     delete backMat;
-}
-
+
+  static_cast<BaseObject*>(this)->destroy();
+}
 
 /**

orxonox/trunk/src/glmenu/glmenu_imagescreen.h

@@ -8 +8 @@
 #define _GLMENU_IMAGESCREEN_H
 
-#include "stdincl.h"
-class Texture;
+#include "base_object.h"
+
 class Material;
 
@@ -19 +19 @@
  public:
   ~GLMenuImageScreen ();
+  void destroy(void);
 
   static GLMenuImageScreen* getInstance();