projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skybox
[opengl.git]
/
model.hpp
diff --git
a/model.hpp
b/model.hpp
index a39c70a0651eb8043cd14bbb9ea4e0567bba85d9..de8e27f8639f8c422de78127faa300ec15b4fd45 100644
(file)
--- a/
model.hpp
+++ b/
model.hpp
@@
-8,6
+8,7
@@
#include <assimp/scene.h>
#include <assimp/Importer.hpp>
#include "material.hpp"
#include <assimp/scene.h>
#include <assimp/Importer.hpp>
#include "material.hpp"
+#include "program.hpp"
class Model {
class Model {
@@
-18,7
+19,7
@@
class Model {
};
public:
};
public:
- Model(const std::string &path,
GLuint progId
);
+ Model(const std::string &path,
Program p
);
void draw() const;
class Node {
void draw() const;
class Node {
@@
-40,7
+41,7
@@
class Model {
Node* find(const std::string &name);
private:
Node* find(const std::string &name);
private:
- const
GLuint progId
;
+ const
Program program
;
std::vector<Mesh> meshes;
Node *root;
std::vector<Mesh> meshes;
Node *root;