projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add glTF PBR model loading
[opengl.git]
/
image.hpp
diff --git
a/image.hpp
b/image.hpp
index 41b45ba3ac01ade461d54741c7e997560fcedcb6..caa951c4974e4b26187f2306dcd5b562d90a495b 100644
(file)
--- a/
image.hpp
+++ b/
image.hpp
@@
-15,7
+15,9
@@
class Image {
unsigned char *data() const;
GLfloat width() const;
GLfloat height() const;
unsigned char *data() const;
GLfloat width() const;
GLfloat height() const;
- GLuint format() const;
+ GLenum format() const;
+ GLint internalFormat() const;
+ GLenum type() const;
private:
#ifdef __APPLE__
CFDataRef dataRef;
private:
#ifdef __APPLE__
CFDataRef dataRef;
@@
-23,6
+25,7
@@
class Image {
CGImageAlphaInfo alphaInfo;
CGColorSpaceRef colorSpace;
GLfloat _width, _height;
CGImageAlphaInfo alphaInfo;
CGColorSpaceRef colorSpace;
GLfloat _width, _height;
+ size_t bitsPerComponent;
#endif
};
#endif
};