Browse Source

Merge branch 'master' into compatibility

Vladimír Vondruš 13 years ago
parent
commit
53f15288e6
  1. 2
      src/Math/Matrix4.h
  2. 3
      src/Renderer.cpp
  3. 2
      src/Renderer.h
  4. 2
      src/SceneGraph/Camera3D.h

2
src/Math/Matrix4.h

@ -31,7 +31,7 @@
#include "Math/Matrix.h" #include "Math/Matrix.h"
#include "Math/Vector4.h" #include "Math/Vector4.h"
#ifdef _WIN32 /* I so HATE windows.h */ #ifdef _WIN32 /* I so HATE windef.h */
#undef near #undef near
#undef far #undef far
#endif #endif

3
src/Renderer.cpp

@ -205,6 +205,9 @@ void Renderer::initializeContextBasedFunctionality(Context& context) {
#else #else
static_cast<void>(context); static_cast<void>(context);
#endif #endif
/* Set some "corporate identity" */
setClearColor(Color3(0.125f));
} }
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

2
src/Renderer.h

@ -234,7 +234,7 @@ class MAGNUM_EXPORT Renderer {
/** /**
* @brief Set clear color * @brief Set clear color
* *
* Initial value is fully opaque black. * Initial value is {0.125f, 0.125f, 0.125f, 1.0f}.
* @see @fn_gl{ClearColor} * @see @fn_gl{ClearColor}
*/ */
static void setClearColor(const Color4& color); static void setClearColor(const Color4& color);

2
src/SceneGraph/Camera3D.h

@ -30,7 +30,7 @@
#include "AbstractCamera.h" #include "AbstractCamera.h"
#ifdef _WIN32 /* I so HATE windows.h */ #ifdef _WIN32 /* I so HATE windef.h */
#undef near #undef near
#undef far #undef far
#endif #endif

Loading…
Cancel
Save