Commit 118acfb8 authored by Christopher Tenter's avatar Christopher Tenter

fix bounding box update, fixed function drawing and ARB buffer issue in CameraNode

parent e9cf0f5b
Pipeline #3728 failed with stage
in 64 minutes and 19 seconds
......@@ -193,7 +193,9 @@ bool GLPrimitive::checkVBO()
delete[] vboData_;
vboData_ = 0;
} else if (vboDataInvalid_) {
}
if (vboDataInvalid_) {
updateVBOData();
glBindBuffer(GL_ARRAY_BUFFER, vbo_);
glBufferData(GL_ARRAY_BUFFER, bufSize, vboData_, GL_STATIC_DRAW);
......
......@@ -1813,7 +1813,7 @@ void GLState::bindBuffer(GLenum _target, GLuint _buffer)
if (stateStack_.back().glBufferTargetState_[idx] != _buffer)
#endif
{
glBindBufferARB(_target, _buffer);
glBindBuffer(_target, _buffer);
stateStack_.back().glBufferTargetState_[idx] = _buffer;
}
}
......
......@@ -737,11 +737,11 @@ bool Texture2D::checkTextureMem( GLenum _internalFormat, GLsizei _width, GLsizei
//-----------------------------------------------------------------------------
#if defined(GL_ARB_vertex_buffer_object)
#if defined(GL_VERSION_1_5)
void VertexBufferObject::del() {
if (valid)
glDeleteBuffersARB(1, &vbo);
glDeleteBuffers(1, &vbo);
valid = false;
}
......@@ -753,17 +753,17 @@ void VertexBufferObject::upload(
bind();
glBufferDataARB(target, size, data, usage);
glBufferData(target, size, data, usage);
}
void VertexBufferObject::uploadSubData(
GLuint _offset, GLuint _size, const GLvoid* _data ) {
glBufferSubDataARB(target, _offset, _size, _data);
glBufferSubData(target, _offset, _size, _data);
}
void VertexBufferObject::gen() {
glGenBuffersARB(1, &vbo);
glGenBuffers(1, &vbo);
if(vbo > 0u)
valid = true;
}
......
......@@ -128,7 +128,7 @@ private:
//== CLASS DEFINITION =========================================================
#if defined(GL_ARB_vertex_buffer_object)
#if defined(GL_VERSION_1_5)
class ACGDLLEXPORT VertexBufferObject
{
......@@ -172,14 +172,14 @@ private:
class GeometryBuffer : public VertexBufferObject
{
public:
GeometryBuffer() : VertexBufferObject(GL_ARRAY_BUFFER_ARB) {}
GeometryBuffer() : VertexBufferObject(GL_ARRAY_BUFFER) {}
};
class IndexBuffer : public VertexBufferObject
{
public:
IndexBuffer() : VertexBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB) {}
IndexBuffer() : VertexBufferObject(GL_ELEMENT_ARRAY_BUFFER) {}
};
......
This diff is collapsed.
......@@ -100,6 +100,7 @@ void TypeCameraPlugin::contextMenuClicked(QAction* _contextAction) {
// Set frustum flag to whether action is checked or not
object->cameraNode()->showFrustum(_contextAction->isChecked());
emit updatedObject(objectId, UPDATE_VISIBILITY);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment