diff --git a/modules/touch/include/TouchMarker.h b/modules/touch/include/TouchMarker.h index 6f5e84359b..cd7d21a456 100644 --- a/modules/touch/include/TouchMarker.h +++ b/modules/touch/include/TouchMarker.h @@ -77,7 +77,6 @@ class TouchMarker : public properties::PropertyOwner GLuint _vertexPositionBuffer; int _numFingers; - bool _listIsDirty; bool _textureIsDirty; }; diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl index 1cc46c4802..9109a41988 100644 --- a/modules/touch/shaders/marker_vs.glsl +++ b/modules/touch/shaders/marker_vs.glsl @@ -39,5 +39,5 @@ void main() { //pointRadius = 0.05; //radius; gl_PointSize = 0.05; //radius; - gl_Position = vec3(in_position, -1.0, 1.0); + gl_Position = vec4(in_position, -1.0, 1.0); } \ No newline at end of file diff --git a/modules/touch/src/TouchMarker.cpp b/modules/touch/src/TouchMarker.cpp index b80c9c149d..9bb7781bbe 100644 --- a/modules/touch/src/TouchMarker.cpp +++ b/modules/touch/src/TouchMarker.cpp @@ -46,7 +46,6 @@ TouchMarker::TouchMarker() , _texturePath("texturePath", "Color Texture") , _shader(nullptr) , _texture(nullptr) - , _listIsDirty(false) , _textureIsDirty(false) , _numFingers(0) { @@ -116,9 +115,6 @@ void TouchMarker::update() { if (_shader->isDirty()) _shader->rebuildFromFile(); - if (_listIsDirty) - //createFingerList(); - if (_textureIsDirty) { loadTexture(); _textureIsDirty = false; @@ -147,7 +143,7 @@ void TouchMarker::loadTexture() { void TouchMarker::createVertexList(const std::vector list) { _numFingers = list.size(); - std::vector vertexData(_numFingers * 2, 0); + std::vector vertexData(_numFingers * 2, 0.0f); int i = 0; for (const TUIO::TuioCursor& c : list) { vertexData.at(i) = 2 * (c.getX() - 0.5); @@ -164,7 +160,7 @@ void TouchMarker::createVertexList(const std::vector list) { 2, GL_FLOAT, GL_FALSE, - 0, + sizeof(GLfloat) * 2, reinterpret_cast(0) ); }