Browse Source

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
master
Shaun Reed 2 weeks ago
parent
commit
5452520324
  1. 12
      CMakeLists.txt
  2. 2
      src/model.cpp
  3. 3
      src/model.h
  4. 13
      src/resourcemanager.cpp
  5. 2
      src/skybox.cpp
  6. 3
      src/skybox.h

12
CMakeLists.txt

@ -50,7 +50,7 @@ find_package(assimp REQUIRED) @@ -50,7 +50,7 @@ find_package(assimp REQUIRED)
# Mainwidget
include(GenerateExportHeader)
add_library(main-widget SHARED
add_library(main-widget STATIC
src/mainwidget.cpp src/mainwidget.h
src/mainwindow.cpp src/mainwindow.h src/mainwindow.ui
src/input.cpp src/input.h
@ -67,8 +67,16 @@ add_library(main-widget SHARED @@ -67,8 +67,16 @@ add_library(main-widget SHARED
)
target_include_directories(main-widget PUBLIC src/)
#if(TARGET assimp)
target_link_libraries(main-widget PRIVATE assimp)
target_link_libraries(main-widget PUBLIC Qt${QT_VERSION_MAJOR}::OpenGLWidgets)
#else()
# target_link_libraries(main-widget PRIVATE assimp::assimp)
#endif()
target_link_libraries(main-widget PUBLIC Qt6::OpenGLWidgets)
if(WIN32)
find_package(OpenGL REQUIRED)
target_link_libraries(main-widget PUBLIC OpenGL::GL)
endif()
################################################################################
# Final Application

2
src/model.cpp

@ -31,6 +31,8 @@ Model * Model::getInstance(const char * name) @@ -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();

3
src/model.h

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <QOpenGLShaderProgram>
#include <QOpenGLTexture>
#include <QOpenGLVertexArrayObject>
#include <QOpenGLFunctions>
// Assimp
#include <assimp/Importer.hpp>
@ -43,7 +44,7 @@ struct ModelTexture { @@ -43,7 +44,7 @@ struct ModelTexture {
class Model;
class ModelMesh {
class ModelMesh : protected QOpenGLFunctions {
public:
friend Model;
typedef std::vector<ModelVertex> Vertices;

13
src/resourcemanager.cpp

@ -7,7 +7,18 @@ @@ -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/";

2
src/skybox.cpp

@ -69,6 +69,8 @@ void Skybox::draw() @@ -69,6 +69,8 @@ void Skybox::draw()
void Skybox::init()
{
initializeOpenGLFunctions();
// Set up shader program
mProgram.create();
mProgram.addShaderFromSourceFile(QOpenGLShader::Vertex, ":/skybox.vert");

3
src/skybox.h

@ -13,12 +13,13 @@ @@ -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; )

Loading…
Cancel
Save