diff options
| author | Mateja Marić <mail@matejamaric.com> | 2021-02-19 15:19:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 15:19:45 +0100 |
| commit | 3b89cf20f583a82a3cd5bdbe04c07630838af5c3 (patch) | |
| tree | 46b427b725795b86e7414111720b547aacfddceb /src/ObjModel.h | |
| parent | ea5f50550ea2027043c9c3d0f5d998a1a1d336a5 (diff) | |
| parent | cf3e1771a342764ca26b2af843f173d1e994ed9f (diff) | |
| download | erender-3b89cf20f583a82a3cd5bdbe04c07630838af5c3.tar.gz erender-3b89cf20f583a82a3cd5bdbe04c07630838af5c3.zip | |
Merge pull request #7 from MatejaMaric/fix-issue-6
Fix issue #6
Diffstat (limited to 'src/ObjModel.h')
| -rw-r--r-- | src/ObjModel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ObjModel.h b/src/ObjModel.h index 9f66867..63d49ef 100644 --- a/src/ObjModel.h +++ b/src/ObjModel.h @@ -5,6 +5,7 @@ #include<sstream>
#include<fstream>
#include<exception>
+#include<chrono>
struct Triangle {
int p[3][3];
@@ -21,6 +22,8 @@ public: std::vector<Texture_Coordinates> uvcoo;
std::vector<Vector4f> normals;
std::vector<Triangle> faces;
+ bool isLoaded;
+ std::chrono::duration<double> loadingTime;
ObjModel();
ObjModel(std::string fileName);
ObjModel(const ObjModel& a);
|