joshua/libj
Archived
1
Fork 0
Code Activity

added support for arrays (via std::array)

Browse source
This commit is contained in:
Joshua Moerman 2011-09-03 16:38:28 +02:00
parent 72dd50e0d2
commit dadeddcafa
2 changed files with 96 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
J/interpolator.h
View file

@ -11,6 +11,9 @@
#include <tr1/functional>
// NOTE: there is a specialisation for std::array
// But i'm not glad with how this is done...
namespace J {
namespace interpolators {
@ -58,16 +61,17 @@ class interpolator {
public:
interpolator(T begin_value_ = T(0), size_t length_ = 100) :
template <typename S>
interpolator(S begin_value_, size_t length_ = 100) :
ease_function(interpolators::cubic_in_out())
, length(length_)
, steps(0)
, steps(length_)
, value(begin_value_)
, begin_value(begin_value_)
, end_value(begin_value_) {}
template <typename F>
interpolator(T begin_value_, size_t length_, F ease_function_) :
template <typename S, typename F>
interpolator(S begin_value_, size_t length_, F ease_function_) :
ease_function(ease_function_)
, length(length_)
, steps(0)
@ -75,13 +79,13 @@ public:
, begin_value(begin_value_)
, end_value(begin_value_) {}
operator T&(){
operator T const & () const{
return value;
}
operator T const () const{
return value;
}
T const & get_value() const{
return value;
}
void set_value(T new_value){
begin_value = value;
@ -110,9 +114,82 @@ public:
};
struct foo{
foo(int){}
};
template <typename T, size_t N>
class interpolator<std::array<T, N> > {
std::tr1::function<T (T)> ease_function;
size_t length;
size_t steps;
std::array<T, N> value;
std::array<T, N> begin_value;
std::array<T, N> end_value;
public:
template <typename S>
interpolator(S begin_value_, size_t length_ = 100) :
ease_function(interpolators::cubic_in_out())
, length(length_)
, steps(length_)
, value(begin_value_)
, begin_value(begin_value_)
, end_value(begin_value_) {}
template <typename S, typename F>
interpolator(S const & begin_value_, size_t length_, F const & ease_function_) :
ease_function(ease_function_)
, length(length_)
, steps(0)
, value(begin_value_)
, begin_value(begin_value_)
, end_value(begin_value_) {}
std::array<T, N> const & get_value() const{
return value;
}
operator std::array<T, N> const & () const{
return value;
}
void set_value(std::array<T, N> const & new_value){
begin_value = value;
end_value = new_value;
steps = 0;
}
void set_value(T const (& new_value)[N]){
begin_value = value;
for (unsigned int i = 0; i < N; ++i) {
end_value[i] = new_value[i];
}
steps = 0;
}
void set_length(size_t new_length){
T ratio = (T) steps / (T) length;
length = new_length;
steps = ratio*length;
}
template <typename F>
void set_ease_function(F new_ease_function){
ease_function = new_ease_function;
}
void interpolate(){
if(steps >= length) return;
++steps;
T ratio = (T) steps / (T) length;
ratio = ease_function(ratio);
for (unsigned int i = 0; i < N; ++i) {
value[i] = (T(1) - ratio)*begin_value[i] + ratio*end_value[i];
}
}
};
} // namespace J

8
J/shader.h
View file

@ -16,13 +16,15 @@
#include <vector>
#include <iterator>
#import "basic.h"
#include "basic.h"
#include "array.h"
// TODO: do glValidateProgram, like in the OpenGL template (see bottom)
// TODO: add error checking at set_uniforms?
// TODO: use an uniform map? (benchmark first!)
// TODO: allow arrays is uniforms (now all counts are 1)
// TODO: matrix attributes are not handled well (they take up 4 indices in the attributes)
// NOTE: there is only 1 set_uniform for std::array...
namespace J {
@ -176,6 +178,10 @@ public:
glUniformMatrix4fv(glGetUniformLocation(program, name), 1, trans, value);
}
void set_uniform(char const* name, const std::array<GLfloat, 16> & value, GLboolean trans) const {
glUniformMatrix4fv(glGetUniformLocation(program, name), 1, trans, &value[0]);
}
void set_uniform(char const* name, const GLfloat (&value)[9], GLboolean trans) const {
glUniformMatrix3fv(glGetUniformLocation(program, name), 1, trans, value);
}