Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-17 18:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Changed the vertex and index buffer types to a class.

Browse source
This commit is contained in:
leo 2015-04-30 22:35:40 +00:00
parent 20945362e5
commit 170b7fc775
4 changed files with 73 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
common/lc_context.cpp
View file

@ -303,89 +303,89 @@ bool lcContext::SaveRenderToTextureImage(const QString& FileName, int Width, int
lcVertexBuffer lcContext::CreateVertexBuffer(int Size, const void* Data)
{
lcVertexBuffer VertexBuffer;
if (GL_HasVertexBufferObject())
{
lcVertexBuffer VertexBuffer;
glGenBuffers(1, &VertexBuffer);
glBindBuffer(GL_ARRAY_BUFFER_ARB, VertexBuffer);
glGenBuffers(1, &VertexBuffer.Object);
glBindBuffer(GL_ARRAY_BUFFER_ARB, VertexBuffer.Object);
glBufferData(GL_ARRAY_BUFFER_ARB, Size, Data, GL_STATIC_DRAW_ARB);
glBindBuffer(GL_ARRAY_BUFFER_ARB, 0); // context remove
mVertexBufferObject = 0;
return VertexBuffer;
}
else
{
void* VertexBuffer = malloc(Size);
memcpy(VertexBuffer, Data, Size);
return (lcVertexBuffer)VertexBuffer;
VertexBuffer.Pointer = malloc(Size);
memcpy(VertexBuffer.Pointer, Data, Size);
}
return VertexBuffer;
}
void lcContext::DestroyVertexBuffer(lcVertexBuffer& VertexBuffer)
{
if (!VertexBuffer)
if (!VertexBuffer.IsValid())
return;
if (GL_HasVertexBufferObject())
{
if (mVertexBufferObject == VertexBuffer)
if (mVertexBufferObject == VertexBuffer.Object)
{
glBindBuffer(GL_ARRAY_BUFFER_ARB, 0);
mVertexBufferObject = 0;
}
glDeleteBuffers(1, &VertexBuffer);
glDeleteBuffers(1, &VertexBuffer.Object);
}
else
{
free((void*)VertexBuffer);
free(VertexBuffer.Pointer);
}
VertexBuffer.Pointer = NULL;
}
lcIndexBuffer lcContext::CreateIndexBuffer(int Size, const void* Data)
{
lcIndexBuffer IndexBuffer;
if (GL_HasVertexBufferObject())
{
lcIndexBuffer IndexBuffer;
glGenBuffers(1, &IndexBuffer);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, IndexBuffer);
glGenBuffers(1, &IndexBuffer.Object);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, IndexBuffer.Object);
glBufferData(GL_ELEMENT_ARRAY_BUFFER_ARB, Size, Data, GL_STATIC_DRAW_ARB);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, 0); // context remove
mIndexBufferObject = 0;
return IndexBuffer;
}
else
{
void* IndexBuffer = malloc(Size);
memcpy(IndexBuffer, Data, Size);
return (lcIndexBuffer)IndexBuffer;
IndexBuffer.Pointer = malloc(Size);
memcpy(IndexBuffer.Pointer, Data, Size);
}
return IndexBuffer;
}
void lcContext::DestroyIndexBuffer(lcIndexBuffer& IndexBuffer)
{
if (!IndexBuffer)
if (!IndexBuffer.IsValid())
return;
if (GL_HasVertexBufferObject())
{
if (mIndexBufferObject == IndexBuffer)
if (mIndexBufferObject == IndexBuffer.Object)
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
mIndexBufferObject = 0;
}
glDeleteBuffers(1, &IndexBuffer);
glDeleteBuffers(1, &IndexBuffer.Object);
}
else
{
free((void*)IndexBuffer);
free(IndexBuffer.Pointer);
}
}
@ -411,7 +411,7 @@ void lcContext::SetVertexBuffer(lcVertexBuffer VertexBuffer)
{
if (GL_HasVertexBufferObject())
{
GLuint VertexBufferObject = VertexBuffer;
GLuint VertexBufferObject = VertexBuffer.Object;
mVertexBufferPointer = NULL;
if (VertexBufferObject != mVertexBufferObject)
@ -423,7 +423,7 @@ void lcContext::SetVertexBuffer(lcVertexBuffer VertexBuffer)
}
else
{
mVertexBufferPointer = (char*)VertexBuffer;
mVertexBufferPointer = (char*)VertexBuffer.Pointer;
mVertexBufferOffset = (char*)~0;
}
}
@ -497,7 +497,7 @@ void lcContext::SetIndexBuffer(lcIndexBuffer IndexBuffer)
{
if (GL_HasVertexBufferObject())
{
GLuint IndexBufferObject = IndexBuffer;
GLuint IndexBufferObject = IndexBuffer.Object;
mIndexBufferPointer = NULL;
if (IndexBufferObject != mIndexBufferObject)
@ -508,7 +508,7 @@ void lcContext::SetIndexBuffer(lcIndexBuffer IndexBuffer)
}
else
{
mIndexBufferPointer = (char*)IndexBuffer;
mIndexBufferPointer = (char*)IndexBuffer.Pointer;
}
}
@ -529,10 +529,10 @@ void lcContext::BindMesh(lcMesh* Mesh)
if (Mesh->mVertexCacheOffset != -1)
{
GLuint VertexBufferObject = Library->mVertexBuffer;
mVertexBufferPointer = (char*)Mesh->mVertexCacheOffset;
GLuint IndexBufferObject = Library->mIndexBuffer;
mIndexBufferPointer = (char*)Mesh->mIndexCacheOffset;
GLuint VertexBufferObject = Library->mVertexBuffer.Object;
mVertexBufferPointer = (char*)(quintptr)Mesh->mVertexCacheOffset;
GLuint IndexBufferObject = Library->mIndexBuffer.Object;
mIndexBufferPointer = (char*)(quintptr)Mesh->mIndexCacheOffset;
if (VertexBufferObject != mVertexBufferObject)
{

42
common/lc_context.h
View file

@ -18,11 +18,45 @@ public:
lcArray<lcObject*> mInterfaceObjects;
};
typedef quintptr lcVertexBuffer;
typedef quintptr lcIndexBuffer;
class lcVertexBuffer
{
public:
lcVertexBuffer()
: Pointer(NULL)
{
}
#define LC_INVALID_VERTEX_BUFFER 0
#define LC_INVALID_INDEX_BUFFER 0
bool IsValid() const
{
return Pointer != NULL;
}
union
{
GLuint Object;
void* Pointer;
};
};
class lcIndexBuffer
{
public:
lcIndexBuffer()
: Pointer(NULL)
{
}
bool IsValid() const
{
return Pointer != NULL;
}
union
{
GLuint Object;
void* Pointer;
};
};
class lcContext
{

2
common/lc_library.cpp
View file

@ -33,8 +33,6 @@ lcPiecesLibrary::lcPiecesLibrary()
mCacheFileName[0] = 0;
mSaveCache = false;
mBuffersDirty = false;
mVertexBuffer = LC_INVALID_VERTEX_BUFFER;
mIndexBuffer = LC_INVALID_INDEX_BUFFER;
}
lcPiecesLibrary::~lcPiecesLibrary()

3
common/view.cpp
View file

@ -20,7 +20,6 @@ View::View(lcModel* Model)
{
mModel = Model;
mCamera = NULL;
mGridBuffer = LC_INVALID_VERTEX_BUFFER;
memset(mGridSettings, 0, sizeof(mGridSettings));
mDragState = LC_DRAGSTATE_NONE;
@ -1256,7 +1255,7 @@ void View::DrawGrid()
MaxY = 2;
}
if (mGridBuffer == LC_INVALID_VERTEX_BUFFER || MinX != mGridSettings[0] || MinY != mGridSettings[1] || MaxX != mGridSettings[2] || MaxY != mGridSettings[3] ||
if (!mGridBuffer.IsValid() || MinX != mGridSettings[0] || MinY != mGridSettings[1] || MaxX != mGridSettings[2] || MaxY != mGridSettings[3] ||
Spacing != mGridSettings[4] || (Preferences.mDrawGridStuds ? 1 : 0) != mGridSettings[5] || (Preferences.mDrawGridLines ? 1 : 0) != mGridSettings[6])
{
int VertexBufferSize = 0;