From 9f25c3632cfd5c669a2ad24255e2e85dfa1cb460 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 13 Nov 2014 23:45:32 +0200 Subject: [PATCH] Miscellaneous fixes --- source/animatedobject.cpp | 2 +- source/bufferable.cpp | 1 + source/bufferable.h | 1 - source/postprocessor.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp index 3a1d9d83..8b030978 100644 --- a/source/animatedobject.cpp +++ b/source/animatedobject.cpp @@ -37,7 +37,7 @@ void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m) if(link*16>=pose_data.size()) pose_data.resize((link+1)*16); copy(m.data(), m.data()+16, &pose_data[link*16]); - shdata->uniform_matrix4_array("pose[0]", pose_data.size()/16, &pose_data[0]); + shdata->uniform_matrix4_array("pose", pose_data.size()/16, &pose_data[0]); } } diff --git a/source/bufferable.cpp b/source/bufferable.cpp index 569ffb2f..e6b52ddf 100644 --- a/source/bufferable.cpp +++ b/source/bufferable.cpp @@ -40,6 +40,7 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev) } } + dirty = true; update_offset(); } diff --git a/source/bufferable.h b/source/bufferable.h index f157c628..a88f7b07 100644 --- a/source/bufferable.h +++ b/source/bufferable.h @@ -37,7 +37,6 @@ private: protected: mutable bool dirty; -protected: Bufferable(); public: virtual ~Bufferable(); diff --git a/source/postprocessor.cpp b/source/postprocessor.cpp index 3c6fbebe..d4f7bd2e 100644 --- a/source/postprocessor.cpp +++ b/source/postprocessor.cpp @@ -34,7 +34,7 @@ const Mesh &PostProcessor::get_fullscreen_quad() const Mesh &PostProcessor::create_fullscreen_quad() { - static Mesh mesh(GL::VERTEX2); + static Mesh mesh(VERTEX2); MeshBuilder builder(mesh); builder.begin(TRIANGLE_STRIP); builder.vertex(-1, 1); -- 2.45.2