Windows updates (@OgreTransporter)
+ Fix resource path on Windows + Fix missing OpenGL functions on Windows + Create static library + Fix CMake for newer assimp versions + Closes #2
This commit is contained in:
@@ -31,6 +31,8 @@ Model * Model::getInstance(const char * name)
|
||||
|
||||
void ModelMesh::initMesh(const char * vert, const char * frag)
|
||||
{
|
||||
initializeOpenGLFunctions();
|
||||
|
||||
// Create VAO, VBO, EBO
|
||||
mVAO->create();
|
||||
mVBO->create();
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <QOpenGLShaderProgram>
|
||||
#include <QOpenGLTexture>
|
||||
#include <QOpenGLVertexArrayObject>
|
||||
#include <QOpenGLFunctions>
|
||||
|
||||
// Assimp
|
||||
#include <assimp/Importer.hpp>
|
||||
@@ -43,7 +44,7 @@ struct ModelTexture {
|
||||
|
||||
class Model;
|
||||
|
||||
class ModelMesh {
|
||||
class ModelMesh : protected QOpenGLFunctions {
|
||||
public:
|
||||
friend Model;
|
||||
typedef std::vector<ModelVertex> Vertices;
|
||||
|
||||
@@ -7,7 +7,18 @@
|
||||
##############################################################################*/
|
||||
|
||||
#include "resourcemanager.h"
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <QtGlobal>
|
||||
|
||||
static std::string nixPath(std::string path)
|
||||
{
|
||||
#ifdef Q_OS_WINDOWS
|
||||
std::replace(path.begin(), path.end(), '\\', '/');
|
||||
#endif
|
||||
return path;
|
||||
}
|
||||
|
||||
std::string RM::resourcesDir =
|
||||
std::string(__FILE__).substr(0, std::string(__FILE__).find("src/"))
|
||||
std::string(__FILE__).substr(0, nixPath(__FILE__).find("src/"))
|
||||
+ "resources/";
|
||||
|
||||
@@ -69,6 +69,8 @@ void Skybox::draw()
|
||||
|
||||
void Skybox::init()
|
||||
{
|
||||
initializeOpenGLFunctions();
|
||||
|
||||
// Set up shader program
|
||||
mProgram.create();
|
||||
mProgram.addShaderFromSourceFile(QOpenGLShader::Vertex, ":/skybox.vert");
|
||||
|
||||
@@ -13,12 +13,13 @@
|
||||
#include <QOpenGLShaderProgram>
|
||||
#include <QOpenGLTexture>
|
||||
#include <QOpenGLVertexArrayObject>
|
||||
#include <QOpenGLFunctions>
|
||||
|
||||
#include <camera3d.h>
|
||||
#include <mesh.h>
|
||||
|
||||
|
||||
class Skybox {
|
||||
class Skybox : protected QOpenGLFunctions {
|
||||
public:
|
||||
// Delegate this constructor to use default skybox images
|
||||
// + This allows creating a skybox with no arguments ( auto s = new Skybox; )
|
||||
|
||||
Reference in New Issue
Block a user