Browse Source

Doc++, minor cleanup.

pull/308/head
Vladimír Vondruš 7 years ago
parent
commit
40cfe06044
  1. 3
      src/Magnum/Platform/Sdl2Application.h
  2. 8
      src/Magnum/Trade/AnimationData.h

3
src/Magnum/Platform/Sdl2Application.h

@ -513,7 +513,8 @@ class Sdl2Application {
/** /**
* @brief Underlying window handle * @brief Underlying window handle
* *
* Use in case you need to call SDL functionality directly. * Use in case you need to call SDL functionality directly. Returns
* @cpp nullptr @ce in case the window was not created yet.
* @note Not available in @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". * @note Not available in @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
*/ */
SDL_Window* window() { return _window; } SDL_Window* window() { return _window; }

8
src/Magnum/Trade/AnimationData.h

@ -202,7 +202,7 @@ enum class AnimationTrackTargetType: UnsignedByte {
/** /**
* This and all higher values are for importer-specific targets. Can be of * This and all higher values are for importer-specific targets. Can be of
* any type, @ref AnimationData::trackTarget() might or might not point to * any type, @ref AnimationData::trackTarget() might or might not point to
* an existing object. See documentation of particular importer for * an existing object. See documentation of a particular importer for
* details. * details.
*/ */
Custom = 128 Custom = 128
@ -214,8 +214,8 @@ MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, AnimationTrackTargetType val
/** /**
@brief Animation track data @brief Animation track data
Used when constructing @ref AnimationData. Fields can be accessed through its Convenience type for populating @ref AnimationData. Has no accessors, as the
API. data are then accessible through @ref AnimationData APIs.
@experimental @experimental
*/ */
class AnimationTrackData { class AnimationTrackData {
@ -453,7 +453,7 @@ template<class V, class R = Animation::ResultOf<V>> MAGNUM_TRADE_EXPORT auto ani
#if !defined(CORRADE_NO_ASSERT) || defined(CORRADE_GRACEFUL_ASSERT) #if !defined(CORRADE_NO_ASSERT) || defined(CORRADE_GRACEFUL_ASSERT)
namespace Implementation { namespace Implementation {
/* LCOV_EXCL_START */ /* LCOV_EXCL_START */
template<class T> constexpr AnimationTrackType animationTypeFor(); template<class> constexpr AnimationTrackType animationTypeFor();
template<> constexpr AnimationTrackType animationTypeFor<bool>() { return AnimationTrackType::Bool; } template<> constexpr AnimationTrackType animationTypeFor<bool>() { return AnimationTrackType::Bool; }
template<> constexpr AnimationTrackType animationTypeFor<Float>() { return AnimationTrackType::Float; } template<> constexpr AnimationTrackType animationTypeFor<Float>() { return AnimationTrackType::Float; }
template<> constexpr AnimationTrackType animationTypeFor<UnsignedInt>() { return AnimationTrackType::UnsignedInt; } template<> constexpr AnimationTrackType animationTypeFor<UnsignedInt>() { return AnimationTrackType::UnsignedInt; }

Loading…
Cancel
Save