Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6634 in orxonox.OLD for trunk/src/lib/sound/sound_source.h


Ignore:
Timestamp:
Jan 21, 2006, 1:18:19 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/sound/sound_source.h

    r5930 r6634  
    4444    ALuint                 sourceID;              //!< The ID of the Source
    4545    const SoundBuffer*     buffer;                //!< The buffer to play in this source.
    46     const PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
     46    const PNode*           sourceNode;            //!< The SourceNode representing the position/velocity... of this source.
    4747};
    4848#endif /* _SOUND_SOURCE_H */
Note: See TracChangeset for help on using the changeset viewer.