From 7183110eee11f64ad9e08fa83da2f014686ad308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 8 Jan 2013 17:04:26 +0100 Subject: [PATCH] Doc++, @todo++ --- src/Buffer.h | 7 ++++--- src/Context.cpp | 4 ++++ src/Math/Math.h | 8 ++++++++ src/SceneGraph/Object.hpp | 2 ++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Buffer.h b/src/Buffer.h index 91ca36587..235833fef 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -40,6 +40,7 @@ data updates. Default way to set or update buffer data with setData() or setSubData() is to explicitly specify data size and pass the pointer to it: @code +Buffer buffer; Vector3* data = new Vector3[200]; buffer.setData(200*sizeof(Vector3), data, Buffer::Usage::StaticDraw); @endcode @@ -265,7 +266,7 @@ class MAGNUM_EXPORT Buffer { /** * Updated frequently as output from OpenGL command and used * frequently for drawing or copying to other images. - * @requires_gles30 Only @ref Magnum::Buffer::Usage "Usage::DynamicCopy" + * @requires_gles30 Only @ref Magnum::Buffer::Usage "Usage::DynamicDraw" * is available in OpenGL ES 2.0. */ DynamicCopy = GL_DYNAMIC_COPY @@ -293,10 +294,10 @@ class MAGNUM_EXPORT Buffer { * buffers aren't already bound somewhere, they are bound to * `Target::CopyRead` and `Target::CopyWrite` before the copy is * performed. - * @requires_gl31 %Extension @extension{ARB,copy_buffer} - * @requires_gles30 Buffer copying is not available in OpenGL ES 2.0. * @see @fn_gl{BindBuffer} and @fn_gl{CopyBufferSubData} or * @fn_gl_extension{NamedCopyBufferSubData,EXT,direct_state_access} + * @requires_gl31 %Extension @extension{ARB,copy_buffer} + * @requires_gles30 %Buffer copying is not available in OpenGL ES 2.0. */ inline static void copy(Buffer* read, Buffer* write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) { copyImplementation(read, write, readOffset, writeOffset, size); diff --git a/src/Context.cpp b/src/Context.cpp index d1ac1e884..050e0e77d 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -82,6 +82,10 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,ARB,texture_float), _extension(GL,ARB,depth_buffer_float), _extension(GL,ARB,texture_rg), + /** + * @todo Remove as it doesn't have the same functionality present in + * GL 3.0 and replace with ARB_framebuffer_object? + */ _extension(GL,EXT,framebuffer_object), _extension(GL,EXT,packed_depth_stencil), _extension(GL,EXT,framebuffer_blit), diff --git a/src/Math/Math.h b/src/Math/Math.h index 91052e156..9bc03cf82 100644 --- a/src/Math/Math.h +++ b/src/Math/Math.h @@ -28,6 +28,14 @@ namespace Magnum { namespace Math { +/** +@todo Vector/scalar overloaded functions (...SIMD): + - min(), max() (component-wise) + - abs() + - sin(), cos()... + - clamp(), lerp() +*/ + #ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct Pow { diff --git a/src/SceneGraph/Object.hpp b/src/SceneGraph/Object.hpp index 697af8daa..f352d23b1 100644 --- a/src/SceneGraph/Object.hpp +++ b/src/SceneGraph/Object.hpp @@ -148,6 +148,8 @@ template std::vector Ob /* Remember object count for later */ std::size_t objectCount = objects.size(); + /** @bug What if there is one objects twice in the list */ + /* Create initial list of joints from original objects */ std::vector*> jointObjects(objects.size()); for(std::size_t i = 0; i != jointObjects.size(); ++i) {