mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 14:29:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix stack corruption bug in TouchMarker

Browse Source
This commit is contained in:
Emil Axelsson
2017-11-02 18:10:30 +01:00
parent ad1a4a21fb
commit 2c486ac38b
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/touch/include/touchmarker.h
View File

@@ -66,9 +66,9 @@ class TouchMarker : public properties::PropertyOwner {
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
std::vector<GLfloat> _vertexData;
GLuint _quad;
GLuint _vertexPositionBuffer;
int _numFingers;
};
} // openspace namespace

14
modules/touch/src/touchmarker.cpp
View File

@@ -33,7 +33,6 @@
namespace {
const std::string _loggerCat = "TouchMarker";
const int MAX_FINGERS = 20;
}
namespace openspace {
@@ -50,7 +49,6 @@ TouchMarker::TouchMarker()
glm::vec3(1.f)
)
, _shader(nullptr)
, _numFingers(0)
{
addProperty(_visible);
addProperty(_radiusSize);
@@ -108,25 +106,25 @@ void TouchMarker::render(const std::vector<TUIO::TuioCursor>& list) {
glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex shader
glPolygonMode(GL_FRONT_AND_BACK, GL_POINT);
glBindVertexArray(_quad);
glDrawArrays(GL_POINTS, 0, _numFingers);
glDrawArrays(GL_POINTS, 0, _vertexData.size() / 2);
_shader->deactivate();
}
}
void TouchMarker::createVertexList(const std::vector<TUIO::TuioCursor>& list) {
_numFingers = static_cast<int>(list.size());
GLfloat vertexData[MAX_FINGERS];
_vertexData.resize(list.size() * 2);
int i = 0;
for (const TUIO::TuioCursor& c : list) {
vertexData[i] = 2 * (c.getX() - 0.5f);
vertexData[i + 1] = -2 * (c.getY() - 0.5f);
_vertexData[i] = 2 * (c.getX() - 0.5f);
_vertexData[i + 1] = -2 * (c.getY() - 0.5f);
i += 2;
}
glBindVertexArray(_quad);
glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
glBufferData(GL_ARRAY_BUFFER, _vertexData.size() * sizeof(GLfloat), _vertexData.data(), GL_STATIC_DRAW);
glEnableVertexAttribArray(0);
glVertexAttribPointer(
0,