TGA and RGB image loading
This commit is contained in:
parent
bc4f402580
commit
2fdbf21e28
7 changed files with 169 additions and 3 deletions
|
@ -7,6 +7,8 @@
|
|||
|
||||
#include <GL/glut.h>
|
||||
|
||||
#include "Texture.h"
|
||||
|
||||
/// Displays a square based pyramid from a base position, height and side length
|
||||
/// \param x X coordinate of the center
|
||||
/// \param y Y coordinate of the center
|
||||
|
@ -19,6 +21,6 @@ void display_pyramid(float x, float y, float z, float c, float h);
|
|||
void display_rotating_pyramid(float x, float y, float z, float c, float h, float alpha);
|
||||
|
||||
/// Draw a tree with two quadrilaterals
|
||||
void display_tree(float x, float y, float z, float h, float w);
|
||||
void display_tree(float x, float y, float z, float h, float w, const Texture& tree_texture);
|
||||
|
||||
#endif //TESTS_OPENGL_DISPLAYERS_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue