Add assimp as external dependency

This commit is contained in:
2022-08-14 17:02:50 -04:00
parent 249a2b4446
commit f3406ee749
7 changed files with 72 additions and 54 deletions

View File

@@ -14,7 +14,7 @@
<string>Qtk - MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="Qtk::MainWidget" name="openGLWidget">
<widget class="Qtk::MainWidget" name="openGLWidget" native="true">
<property name="geometry">
<rect>
<x>10</x>
@@ -94,8 +94,8 @@
</widget>
<customwidgets>
<customwidget>
<class>MainWidget</class>
<extends>QOpenGLWidget</extends>
<class>Qtk::MainWidget</class>
<extends>QWidget</extends>
<header>mainwidget.h</header>
</customwidget>
</customwidgets>

View File

@@ -602,11 +602,7 @@ void ExampleScene::init()
void ExampleScene::draw()
{
mSkybox->draw();
for (auto & model : mModels) model->draw();
for (const auto &mesh : mMeshes) mesh->draw();
Scene::draw();
mTestPhong->mProgram.bind();
mTestPhong->setUniform("uModelInverseTransposed",

View File

@@ -17,12 +17,13 @@
class ExampleScene : public Qtk::Scene {
public:
ExampleScene();
~ExampleScene();
virtual void init();
virtual void draw();
virtual void draw() override;
virtual void update();
private: