AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 10:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux build fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-05-25 20:24:13 -10:00
parent 20862139b6
commit 9f94db6c82
83 changed files with 839 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/OpenGL/CRenderbuffer.h
View File

@@ -12,7 +12,7 @@ class CRenderbuffer
bool mInitialized;
public:
CRenderbuffer::CRenderbuffer()
CRenderbuffer()
: mWidth(0)
, mHeight(0)
, mEnableMultisampling(false)
@@ -20,7 +20,7 @@ public:
{
}
CRenderbuffer::CRenderbuffer(uint Width, uint Height)
CRenderbuffer(uint Width, uint Height)
: mWidth(Width)
, mHeight(Height)
, mEnableMultisampling(false)
@@ -28,20 +28,20 @@ public:
{
}
CRenderbuffer::~CRenderbuffer()
~CRenderbuffer()
{
if (mInitialized)
glDeleteRenderbuffers(1, &mRenderbuffer);
}
void CRenderbuffer::Init()
void Init()
{
mInitialized = true;
glGenRenderbuffers(1, &mRenderbuffer);
InitStorage();
}
inline void CRenderbuffer::Resize(uint Width, uint Height)
inline void Resize(uint Width, uint Height)
{
mWidth = Width;
mHeight = Height;
@@ -50,13 +50,13 @@ public:
InitStorage();
}
inline void CRenderbuffer::Bind()
inline void Bind()
{
if (!mInitialized) Init();
glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
}
inline void CRenderbuffer::Unbind()
inline void Unbind()
{
glBindRenderbuffer(GL_RENDERBUFFER, 0);
}

4
src/Core/OpenGL/CShader.cpp
View File

@@ -216,8 +216,8 @@ void CShader::SetCurrent()
// ************ STATIC ************
CShader* CShader::FromResourceFile(const TString& rkShaderName)
{
TString VertexShaderFilename = "../resources/shaders/" + rkShaderName + ".vs";
TString PixelShaderFilename = "../resources/shaders/" + rkShaderName + ".ps";
TString VertexShaderFilename = gDataDir + "resources/shaders/" + rkShaderName + ".vs";
TString PixelShaderFilename = gDataDir + "resources/shaders/" + rkShaderName + ".ps";
TString VertexShaderText, PixelShaderText;
if (!FileUtil::LoadFileToString(VertexShaderFilename, VertexShaderText))