Working ABuffer

- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
This commit is contained in:
Jonas Strandstedt
2014-07-23 16:06:49 -04:00
parent ecf3a8539a
commit e99a98224c
12 changed files with 246 additions and 123 deletions

View File

@@ -11,6 +11,8 @@
#include <thread>
#include <mutex>
#include <memory>
#include <map>
#include <functional>
namespace openspace {
@@ -56,6 +58,8 @@ public:
void mouseButtonCallback(int key, int action);
void mousePositionCallback(int x, int y);
void mouseScrollWheelCallback(int pos);
void addKeyCallback(int key, std::function<void(void)> f);
private:
glm::vec3 mapToTrackball(glm::vec2 mousePos);
@@ -77,6 +81,8 @@ private:
// for locking and unlocking
std::mutex cameraGuard_;
std::multimap<int, std::function<void(void)> > _keyCallbacks;
};