Changeset 5239 in orxonox.OLD

Timestamp:

Sep 24, 2005, 11:13:32 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compile-performance-stuff

Location:

trunk/src/lib

Files:

• event/event.cc (modified) (2 diffs)
• event/event.h (modified) (1 diff)
• event/event_listener.h (modified) (1 diff)
• graphics/importer/texture.h (modified) (2 diffs)

trunk/src/lib/event/event.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -24 +24 @@
  *  standard constructor
 */
-Event::Event () 
+Event::Event ()
 {
-   this->setClassID(CL_EVENT, "Event"); 
+//   this->setClassID(CL_EVENT, "Event");
 
 }
-
-
-/**
- *  standard deconstructor
-
-*/
-Event::~Event () 
-{
-  // delete what has to be deleted here
-}

trunk/src/lib/event/event.h

@@ -10 +10 @@
 
 
-#include "base_object.h"
+//#include "base_object.h"
 #include "sdlincl.h"
 
 //! An abstract event class
-class Event : virtual public BaseObject {
+class Event {
 
  public:
   Event();
-  virtual ~Event();
-
 
   int      offset;                      //!< offset in the event type array

trunk/src/lib/event/event_listener.h

@@ -1 +1 @@
 /*!
  * @file event_listener.h
-  *  Definition of an event listener base class
-
+ *  Definition of an event listener base class
 */
 

trunk/src/lib/graphics/importer/texture.h

@@ -9 +9 @@
 #define _TEXTURE_H
 
-#include "sdlincl.h"
 #include "glincl.h"
 
 #include "debug.h"
 
+struct SDL_Surface;
+
 //! an enumerator for different procedural texture-types
 typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
-                            TEXTURE_NOISE };
+                            TEXTURE_NOISE };
 
 //! A Class, that reads in Textures from different fileformats.
@@ -28 +29 @@
 
   /** @returns The textureID of this texture.  */
-  inline GLuint getTexture() {return this->texture;} 
+  inline GLuint getTexture() const { return this->texture; };
   GLuint loadTexToGL (SDL_Surface* surface);
   /** @returns true if texture has alpha, false otherwise */