Changeset 7300
- Timestamp:
- Aug 31, 2010, 11:19:49 PM (14 years ago)
- Location:
- code/branches/doc/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/doc/src/OrxonoxConfig.h.in
r5695 r7300 145 145 * Options 146 146 *-------------------------------*/ 147 /** 148 @def ORXONOX_RELEASE 149 Enables expensive (build time) optimisations and disables certain features 150 */ 147 /// Enables expensive (build time) optimisations and disables certain features 151 148 #cmakedefine ORXONOX_RELEASE 152 149 -
code/branches/doc/src/SpecialConfig.h.in
r5781 r7300 43 43 #include <boost/preprocessor/stringize.hpp> 44 44 45 /** 46 @def CEGUILUA_USE_INTERNAL_LIBRARY 47 Set whether we must suffix "ceguilua/" for the CEGUILua.h include 48 */ 45 /// Set whether we must suffix "ceguilua/" for the CEGUILua.h include 49 46 #cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY 50 47 51 /** 52 @def DEPENDENCY_PACKAGE_ENABLE 53 Defined if a precompiled depdency package was used. We then copy all libraries 54 too when installing. 55 */ 48 /// Defined if a precompiled depdency package was used. We then copy all libraries too when installing. 56 49 #cmakedefine DEPENDENCY_PACKAGE_ENABLE 57 50 58 /** 59 @def INSTALL_COPYABLE 60 Orxonox either gets installed to the system or just into a folder. 61 The latter uses relative paths. 62 */ 51 /// Orxonox either gets installed to the system or just into a folder. The latter uses relative paths. 63 52 #cmakedefine INSTALL_COPYABLE 64 53 65 /** 66 @def CMAKE_CONFIGURATION_TYPES 67 Using MSVC or XCode IDE 68 */ 54 /// Using MSVC or XCode IDE 69 55 #cmakedefine CMAKE_CONFIGURATION_TYPES 70 56 … … 126 112 } } 127 113 128 /** 129 @def ORXONOX_USE_WINMAIN 130 Use main() or WinMain()? 131 */ 114 /// Use main() or WinMain()? 132 115 #cmakedefine ORXONOX_USE_WINMAIN 133 116 -
code/branches/doc/src/libraries/core/Identifier.h
r7297 r7300 303 303 class ClassIdentifier : public Identifier 304 304 { 305 #if true // doxygen workaround: doxygen ignores the following #include because of this #if, removes some warnings 305 306 #define SUPER_INTRUSIVE_DECLARATION_INCLUDE 306 307 #include "Super.h" 308 #endif 307 309 308 310 public: -
code/branches/doc/src/libraries/core/MemoryArchive.cc
r6417 r7300 54 54 } 55 55 56 DataStreamPtr MemoryArchive::open(const String& filename) const56 DataStreamPtr MemoryArchive::open(const Ogre::String& filename) const 57 57 { 58 58 const FileMap& files = archives_s[this->getName()]; … … 64 64 } 65 65 66 void MemoryArchive::findFiles(const String& pattern, bool bRecursive,67 bool bDirs, StringVector* simpleList,FileInfoList* detailList)66 void MemoryArchive::findFiles(const Ogre::String& pattern, bool bRecursive, 67 bool bDirs, Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList) 68 68 { 69 69 const FileMap& files = archives_s[this->getName()]; … … 110 110 } 111 111 112 StringVectorPtr MemoryArchive::find(const String& pattern,112 StringVectorPtr MemoryArchive::find(const Ogre::String& pattern, 113 113 bool recursive, bool dirs) 114 114 { … … 118 118 } 119 119 120 FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern,120 FileInfoListPtr MemoryArchive::findFileInfo(const Ogre::String& pattern, 121 121 bool recursive, bool dirs) 122 122 { … … 126 126 } 127 127 128 bool MemoryArchive::exists(const String& filename)128 bool MemoryArchive::exists(const Ogre::String& filename) 129 129 { 130 130 const FileMap& files = archives_s[this->getName()]; -
code/branches/doc/src/libraries/network/GamestateClient.cc
r7163 r7300 105 105 * @return iterator pointing to the next object in the list 106 106 */ 107 void GamestateClient::removeObject(ObjectList <Synchronisable>::iterator&it) {108 ObjectList <Synchronisable>::iteratortemp=it;107 void GamestateClient::removeObject(ObjectListIterator<Synchronisable> &it) { 108 ObjectListIterator<Synchronisable> temp=it; 109 109 ++it; 110 110 temp->destroy(); // or delete? -
code/branches/doc/src/orxonox/collisionshapes/CollisionShape.cc
r5781 r7300 150 150 } 151 151 152 void CollisionShape::calculateLocalInertia( btScalarmass, btVector3& inertia) const152 void CollisionShape::calculateLocalInertia(float mass, btVector3& inertia) const 153 153 { 154 154 if (this->collisionShape_) -
code/branches/doc/src/orxonox/controllers/ArtificialController.cc
r7297 r7300 558 558 559 559 /** 560 @brief Master sets its slaves free for @ varFREEDOM_COUNT seconds.560 @brief Master sets its slaves free for @ref FREEDOM_COUNT seconds. 561 561 */ 562 562 void ArtificialController::forceFreeSlaves()
Note: See TracChangeset
for help on using the changeset viewer.