mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add multi model format support with Assimp

Browse Source 
* Update submodule Ghoul to point to branch feature/multitexturing

* Remove old datastructure for ModelGeometry (moved to ghoul)

* Change RenderableModel to work with new ModelGeomtry structure in
  ghoul

* Work in progress: Textures
This commit is contained in:
Malin Ejdbo
2020-10-20 10:32:12 +02:00
parent 660d2b6311
commit 6df1667583
10 changed files with 31 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/base/rendering/renderablemodel.h
View File

@@ -33,6 +33,7 @@
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/vector/vec3property.h>
#include <ghoul/misc/managedmemoryuniqueptr.h>
#include <ghoul/io/model/modelreader.h>
#include <ghoul/opengl/uniformcache.h>
#include <memory>
@@ -41,6 +42,8 @@ namespace ghoul::opengl {
class Texture;
} // namespace ghoul::opengl
namespace ghoul::modelgeometry { class ModelGeometry; }
namespace openspace {
struct RenderData;
@@ -48,7 +51,6 @@ struct UpdateData;
class LightSource;
namespace documentation { struct Documentation; }
namespace modelgeometry { class ModelGeometry; }
class RenderableModel : public Renderable {
public:
@@ -67,7 +69,8 @@ public:
static documentation::Documentation Documentation();
private:
std::vector<ghoul::mm_unique_ptr<modelgeometry::ModelGeometry>> _geometry;
std::string _file;
std::unique_ptr<ghoul::modelgeometry::ModelGeometry> _geometry;
properties::FloatProperty _ambientIntensity;