Browse Source

Doc++, @todo++

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
7183110eee
  1. 7
      src/Buffer.h
  2. 4
      src/Context.cpp
  3. 8
      src/Math/Math.h
  4. 2
      src/SceneGraph/Object.hpp

7
src/Buffer.h

@ -40,6 +40,7 @@ data updates.
Default way to set or update buffer data with setData() or setSubData() is to Default way to set or update buffer data with setData() or setSubData() is to
explicitly specify data size and pass the pointer to it: explicitly specify data size and pass the pointer to it:
@code @code
Buffer buffer;
Vector3* data = new Vector3[200]; Vector3* data = new Vector3[200];
buffer.setData(200*sizeof(Vector3), data, Buffer::Usage::StaticDraw); buffer.setData(200*sizeof(Vector3), data, Buffer::Usage::StaticDraw);
@endcode @endcode
@ -265,7 +266,7 @@ class MAGNUM_EXPORT Buffer {
/** /**
* Updated frequently as output from OpenGL command and used * Updated frequently as output from OpenGL command and used
* frequently for drawing or copying to other images. * 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. * is available in OpenGL ES 2.0.
*/ */
DynamicCopy = GL_DYNAMIC_COPY DynamicCopy = GL_DYNAMIC_COPY
@ -293,10 +294,10 @@ class MAGNUM_EXPORT Buffer {
* buffers aren't already bound somewhere, they are bound to * buffers aren't already bound somewhere, they are bound to
* `Target::CopyRead` and `Target::CopyWrite` before the copy is * `Target::CopyRead` and `Target::CopyWrite` before the copy is
* performed. * 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 * @see @fn_gl{BindBuffer} and @fn_gl{CopyBufferSubData} or
* @fn_gl_extension{NamedCopyBufferSubData,EXT,direct_state_access} * @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) { inline static void copy(Buffer* read, Buffer* write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) {
copyImplementation(read, write, readOffset, writeOffset, size); copyImplementation(read, write, readOffset, writeOffset, size);

4
src/Context.cpp

@ -82,6 +82,10 @@ const std::vector<Extension>& Extension::extensions(Version version) {
_extension(GL,ARB,texture_float), _extension(GL,ARB,texture_float),
_extension(GL,ARB,depth_buffer_float), _extension(GL,ARB,depth_buffer_float),
_extension(GL,ARB,texture_rg), _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,framebuffer_object),
_extension(GL,EXT,packed_depth_stencil), _extension(GL,EXT,packed_depth_stencil),
_extension(GL,EXT,framebuffer_blit), _extension(GL,EXT,framebuffer_blit),

8
src/Math/Math.h

@ -28,6 +28,14 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
/**
@todo Vector/scalar overloaded functions (...SIMD):
- min(), max() (component-wise)
- abs()
- sin(), cos()...
- clamp(), lerp()
*/
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<std::uint32_t exponent> struct Pow { template<std::uint32_t exponent> struct Pow {

2
src/SceneGraph/Object.hpp

@ -148,6 +148,8 @@ template<class Transformation> std::vector<typename Transformation::DataType> Ob
/* Remember object count for later */ /* Remember object count for later */
std::size_t objectCount = objects.size(); 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 */ /* Create initial list of joints from original objects */
std::vector<Object<Transformation>*> jointObjects(objects.size()); std::vector<Object<Transformation>*> jointObjects(objects.size());
for(std::size_t i = 0; i != jointObjects.size(); ++i) { for(std::size_t i = 0; i != jointObjects.size(); ++i) {

Loading…
Cancel
Save