mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
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:
@@ -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;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user