gpuray_glsl

diff src/gpuscene.h @ 4:2ed3da7dc0bc

broken
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 10 Nov 2014 01:26:00 +0200
parents f234630e38ff
children
line diff
     1.1 --- a/src/gpuscene.h	Sun Nov 09 20:13:33 2014 +0200
     1.2 +++ b/src/gpuscene.h	Mon Nov 10 01:26:00 2014 +0200
     1.3 @@ -6,10 +6,11 @@
     1.4  #include "sphere.h"
     1.5  #include "plane.h"
     1.6  #include "box.h"
     1.7 +#include "cone.h"
     1.8  
     1.9  class GPUScene : public Scene {
    1.10  public:
    1.11 -	enum { TEX_SPHERE, TEX_PLANE, TEX_BOX, TEX_TEXTURE, TEX_ENV, TEX_XFORM, NUM_TEXTURES };
    1.12 +	enum { TEX_SPHERE, TEX_PLANE, TEX_BOX, TEX_CONE, TEX_TEXTURE, TEX_ENV, TEX_XFORM, NUM_TEXTURES };
    1.13  
    1.14  private:
    1.15  	unsigned int textures[NUM_TEXTURES];
    1.16 @@ -20,6 +21,7 @@
    1.17  	void create_sphere_texture(const std::vector<Sphere*> &spheres);
    1.18  	void create_plane_texture(const std::vector<Plane*> &planes);
    1.19  	void create_box_texture(const std::vector<Box*> &box);
    1.20 +	void create_cone_texture(const std::vector<Cone*> &cones);
    1.21  	void create_megatexture();
    1.22  	void create_env_texture();
    1.23  	void create_xform_texture();