Changeset 6871 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2006, 9:39:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: small fixes (cleanup)

Location:

trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/sound/ogg_player.h (modified) (1 diff)
• world_entities/playable.cc (modified) (3 diffs)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/player.h (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.h (modified) (1 diff)
• world_entities/space_ships/hover.cc (modified) (2 diffs)
• world_entities/space_ships/hover.h (modified) (1 diff)

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

@@ -284 +284 @@
                GL_UNSIGNED_BYTE,
                surface->pixels);
-  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
+  //  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
 
   // build the MipMaps automaticaly

trunk/src/lib/sound/ogg_player.h

@@ -20 +20 @@
 
 
-#define BUFFER_SIZE (4096 * 4)
+#define BUFFER_SIZE (8096 * 4)
 
 
 // the definition of a Ogg-Player
 class OggPlayer : public BaseObject
-  {
-  public:
-    OggPlayer(const char* fileName = NULL);
+{
+public:
+  OggPlayer(const char* fileName = NULL);
 
-    bool open(const char* fileName);
-    void release();
-    void debug();
-    bool playback();
-    bool playing();
-    bool update();
+  bool open(const char* fileName);
+  void release();
+  void debug();
+  bool playback();
+  bool playing();
+  bool update();
 
-  protected:
+protected:
 
-    bool stream(ALuint buffer);
-    void empty();
-    void check();
-    const char* errorString(int code);
+  bool stream(ALuint buffer);
+  void empty();
+  void check();
+  const char* errorString(int code);
 
-  private:
+private:
 
-    FILE*               oggFile;              //!< general file-handler, to open the sound-file
-    OggVorbis_File      oggStream;            //!< The stream this Ogg-player is playing back
-    vorbis_info*        vorbisInfo;           //!< The information held in the opened ogg-file
-    vorbis_comment*     vorbisComment;        //!< Comments about the ogg-file
+  FILE*               oggFile;              //!< general file-handler, to open the sound-file
+  OggVorbis_File      oggStream;            //!< The stream this Ogg-player is playing back
+  vorbis_info*        vorbisInfo;           //!< The information held in the opened ogg-file
+  vorbis_comment*     vorbisComment;        //!< Comments about the ogg-file
 
-    ALuint              buffers[2];           //!< buffers that handle sequentially buffering of the audio
-    ALuint              source;               //!< The source we play back on
-    ALenum              format;               //!< The format we play back
-    bool                trackLoaded;          //!< If a Track has been loaded.
-  };
+  ALuint              buffers[2];           //!< buffers that handle sequentially buffering of the audio
+  ALuint              source;               //!< The source we play back on
+  ALenum              format;               //!< The format we play back
+  bool                trackLoaded;          //!< If a Track has been loaded.
+};
 
 

trunk/src/world_entities/playable.cc

@@ -253 +253 @@
 {
   SYNCHELP_READ_BEGIN();
-  
+
   byte flags;
-  
+
   SYNCHELP_READ_BYTE( flags, NWT_PL_FLAGS );
-  
+
   bFire = (flags & FLAGS_bFire) != 0;
-  
+
   return SYNCHELP_READ_N;
 }
@@ -267 +267 @@
   SYNCHELP_WRITE_BEGIN();
   byte flags = 0;
-  
+
   if ( bFire )
     flags |= FLAGS_bFire;
-  
+
 
   SYNCHELP_WRITE_BYTE( flags, NWT_PL_FLAGS );
   oldFlags = flags;
 
-  
+
   return SYNCHELP_WRITE_N;
 }
@@ -282 +282 @@
 {
   byte flags = 0;
-  
+
   if ( bFire )
     flags |= FLAGS_bFire;
-  
+
   return flags!=oldFlags;
 }

trunk/src/world_entities/playable.h

@@ -27 +27 @@
     virtual ~Playable();
 
-    virtual void enter()=0;
-    virtual void leave()=0;
+    virtual void enter() = 0;
+    virtual void leave() = 0;
 
     virtual bool pickup(PowerUp* powerUp);
@@ -54 +54 @@
     /** @return a List of Events in PEV_* sytle */
     inline const std::list<int>& getEventList() { return this->events; };
-    
+
     int       writeSync(const byte* data, int length, int sender);
     int       readSync(byte* data, int maxLength );

trunk/src/world_entities/player.h

@@ -30 +30 @@
     bool              setControllable(Playable* controllalble);
     inline Playable*  getControllable() { return this->controllable; };
+    bool              disconnectControllable();
 
     void              weaponConfigChanged();
-    bool              disconnectControllable();
 
     // eventListener extension.

trunk/src/world_entities/space_ships/helicopter.cc

@@ -213 +213 @@
 }
 
-void  Helicopter::attachCamera()
-{
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
   State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
   State::getCameraTarget()->setParentSoft(this->getWeaponManager()->getFixedTarget());
-
-}
-
-
-void Helicopter::enter()
-{
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  this->attachCamera();
-
-
 }
 

trunk/src/world_entities/space_ships/helicopter.h

@@ -25 +25 @@
     virtual void enter();
     virtual void leave();
-    virtual void attachCamera();
 
     virtual void postSpawn();

trunk/src/world_entities/space_ships/hover.cc

@@ -39 +39 @@
  */
 Hover::~Hover ()
-{}
+{
+
+}
 
 /**
@@ -185 +187 @@
 }
 
-void  Hover::attachCamera()
-{
+
+void Hover::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
   State::getCamera()->setParentSoft(&this->cameraNode);
   State::getCamera()->setRelCoorSoft(-10, 0,0);
   State::getCameraTarget()->setParentSoft(&this->cameraNode);
-}
-
-
-void Hover::enter()
-{
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  this->attachCamera();
-
-
 }
 

trunk/src/world_entities/space_ships/hover.h

@@ -22 +22 @@
     virtual void enter();
     virtual void leave();
-    virtual void attachCamera();
 
     virtual void postSpawn();