mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 11:09:37 -06:00
Linux fix
This commit is contained in:
Submodule ext/ghoul updated: 999399a275...68c53264aa
@@ -78,8 +78,8 @@ private:
|
||||
GLenum _mode;
|
||||
unsigned int _isize;
|
||||
unsigned int _vsize;
|
||||
Vertex *_varray;
|
||||
int *_iarray;
|
||||
Vertex* _varray;
|
||||
int* _iarray;
|
||||
|
||||
glm::dmat3 _stateMatrix; // might need this
|
||||
|
||||
|
||||
@@ -114,7 +114,6 @@ bool ABuffer::reinitialize() {
|
||||
|
||||
void ABuffer::resolve() {
|
||||
if( ! _validShader) {
|
||||
SleepEx(0, TRUE);
|
||||
generateShaderSource();
|
||||
updateShader();
|
||||
_validShader = true;
|
||||
|
||||
@@ -323,7 +323,8 @@ bool OpenSpaceEngine::create(int argc, char** argv,
|
||||
if (!FileSys.directoryExists(token)) {
|
||||
std::string p = absPath(token);
|
||||
LDEBUG("Directory '" << p <<"' does not exsist, creating.");
|
||||
FileSys.createDirectory(p, true);
|
||||
if(FileSys.createDirectory(p, true))
|
||||
LERROR("Directory '" << p <<"' could not be created");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,6 +51,10 @@ RenderableWavefrontObject::RenderableWavefrontObject(const ghoul::Dictionary& di
|
||||
, _programObject(nullptr)
|
||||
, _fovProgram(nullptr)
|
||||
, _texture(nullptr)
|
||||
, _isize(0)
|
||||
, _vsize(0)
|
||||
, _varray(nullptr)
|
||||
, _iarray(nullptr)
|
||||
{
|
||||
std::string name;
|
||||
bool success = dictionary.getValue(constants::scenegraphnode::keyName, name);
|
||||
@@ -108,6 +112,7 @@ void RenderableWavefrontObject::loadObj(const char *filename){
|
||||
fi = fopen(filename, "r");
|
||||
if (fi == NULL) {
|
||||
LERROR("Null Object\n");
|
||||
|
||||
}
|
||||
while (fgets(line, 150, fi) != NULL)
|
||||
{
|
||||
@@ -256,6 +261,9 @@ RenderableWavefrontObject::~RenderableWavefrontObject(){
|
||||
|
||||
bool RenderableWavefrontObject::initialize()
|
||||
{
|
||||
if(_isize == 0)
|
||||
return false;
|
||||
|
||||
bool completeSuccess = true;
|
||||
if (_programObject == nullptr)
|
||||
completeSuccess
|
||||
|
||||
@@ -292,6 +292,10 @@ bool RenderableStars::deinitialize(){
|
||||
|
||||
//#define TMAT
|
||||
void RenderableStars::render(const RenderData& data){
|
||||
if(!_haloProgram)
|
||||
return;
|
||||
if(!_texture)
|
||||
return;
|
||||
assert(_haloProgram);
|
||||
//printOpenGLError();
|
||||
// activate shader
|
||||
|
||||
Reference in New Issue
Block a user