Skip to content

Give OgreOggListener its own Movable Object Type name #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paroj merged 1 commit into from
Jun 23, 2026
Merged

Give OgreOggListener its own Movable Object Type name #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions oggsound/include/OgreOggISound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@

namespace OgreOggSound
{
extern const Ogre::String MOT_OGG_ISOUND;

//! Action to perform after a fade has completed.
/**
@remarks
Expand Down
5 changes: 3 additions & 2 deletions oggsound/include/OgreOggListener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

namespace OgreOggSound
{
extern const Ogre::String MOT_OGG_LISTENER;

//! Listener object (Users ears)
/** Handles properties associated with the listener.
*/
Expand Down Expand Up @@ -91,8 +93,7 @@ namespace OgreOggSound
void update();
/** Gets the movable type string for this object.
@remarks
Overridden function from MovableObject, returns a
Sound object string for identification.
Overridden function from MovableObject.
*/
const Ogre::String& getMovableType(void) const override;
/** Gets the bounding box of this object.
Expand Down
2 changes: 0 additions & 2 deletions oggsound/include/OgreOggSoundFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ namespace OgreOggSound
OgreOggSoundFactory() {}
~OgreOggSoundFactory() {}

static const Ogre::String FACTORY_TYPE_NAME;

const Ogre::String& getType(void) const;

#if AV_OGRE_NEXT_VERSION >= 0x20000
Expand Down
4 changes: 3 additions & 1 deletion oggsound/src/OgreOggISound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,11 @@ namespace OgreOggSound
_updateFade(fTime);
}
/*/////////////////////////////////////////////////////////////////*/
const Ogre::String MOT_OGG_ISOUND = "OgreOggISound";
/*/////////////////////////////////////////////////////////////////*/
const Ogre::String& OgreOggISound::getMovableType(void) const
{
return OgreOggSoundFactory::FACTORY_TYPE_NAME;
return MOT_OGG_ISOUND;
}
/*/////////////////////////////////////////////////////////////////*/
const Ogre::AxisAlignedBox& OgreOggISound::getBoundingBox(void) const
Expand Down
4 changes: 3 additions & 1 deletion oggsound/src/OgreOggListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@ namespace OgreOggSound
return 0;
}
/*/////////////////////////////////////////////////////////////////*/
const Ogre::String MOT_OGG_LISTENER = "OgreOggListener";
/*/////////////////////////////////////////////////////////////////*/
const Ogre::String& OgreOggListener::getMovableType(void) const
{
return OgreOggSoundFactory::FACTORY_TYPE_NAME;
return MOT_OGG_LISTENER;
}
/*/////////////////////////////////////////////////////////////////*/
void OgreOggListener::_notifyAttached(
Expand Down
4 changes: 1 addition & 3 deletions oggsound/src/OgreOggSoundFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@

namespace OgreOggSound
{
const Ogre::String OgreOggSoundFactory::FACTORY_TYPE_NAME = "OgreOggISound";

//-----------------------------------------------------------------------
const Ogre::String& OgreOggSoundFactory::getType(void) const
{
return FACTORY_TYPE_NAME;
return MOT_OGG_ISOUND;
}
//-----------------------------------------------------------------------
#if AV_OGRE_NEXT_VERSION >= 0x20100
Expand Down
6 changes: 3 additions & 3 deletions oggsound/src/OgreOggSoundManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ namespace OgreOggSound
#endif
{
Ogre::SceneManager* s = mListener->getSceneManager();
s->destroyAllMovableObjectsByType(OgreOggSoundFactory::FACTORY_TYPE_NAME);
s->destroyAllMovableObjectsByType(MOT_OGG_ISOUND);
}
_destroyListener();
}
Expand Down Expand Up @@ -525,9 +525,9 @@ namespace OgreOggSound
{
sound = static_cast<OgreOggISound*>(
#if AV_OGRE_NEXT_VERSION >= 0x20000
scnMgr->createMovableObject( OgreOggSoundFactory::FACTORY_TYPE_NAME, &(scnMgr->_getEntityMemoryManager(Ogre::SCENE_DYNAMIC)), &params )
scnMgr->createMovableObject( MOT_OGG_ISOUND, &(scnMgr->_getEntityMemoryManager(Ogre::SCENE_DYNAMIC)), &params )
#else
scnMgr->createMovableObject( name, OgreOggSoundFactory::FACTORY_TYPE_NAME, &params )
scnMgr->createMovableObject( name, MOT_OGG_ISOUND, &params )
#endif
);
}
Expand Down