diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 13:51:33 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 14:14:13 +0000 |
| commit | 7fba471728f2216d7e3b7900297fc3b3531e286c (patch) | |
| tree | 5caef3b2efc23aefccb215ec9005cd8e7d2e91b8 /gfx/image.h | |
| parent | Fix todo for handling a terrain walk from outside the mesh (diff) | |
| parent | Model positions as integers (diff) | |
| download | ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.bz2 ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.xz ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.zip | |
Merge branch 'ints' into terrain
Conflicts fix, compiles, some test failures remain.
Trees not added, possibility of OM invalid handle assertion failures,
normals broken due to integer overflow in Newell's method.
Diffstat (limited to 'gfx/image.h')
| -rw-r--r-- | gfx/image.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gfx/image.h b/gfx/image.h index 8bb4067..6fbbdd1 100644 --- a/gfx/image.h +++ b/gfx/image.h @@ -7,7 +7,9 @@ class Image { public: Image(const char * fileName, int flags); + Image(const std::string & fileName, int flags) : Image(fileName.c_str(), flags) { } + Image(std::span<unsigned char> data, int flags); ~Image(); |