mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Making texture in RenderablePlane modular

Browse Source 
Disable rendering of the Sun by default in favor of the glare texture
This commit is contained in:
Alexander Bock
2015-02-26 13:10:43 +01:00
parent 5a853cc215
commit 836f7a825b
5 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderableplane.h
+7 -4
View File
@@ -25,12 +25,11 @@
#ifndef RENDERABLEPLANE_H_
#define RENDERABLEPLANE_H_
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/util/updatestructures.h>
// ghoul includes
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/vectorproperty.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
@@ -57,15 +56,19 @@ public:
private:
void loadTexture();
void createPlane();
properties::StringProperty _texturePath;
properties::BoolProperty _billboard;
properties::Vec2Property _size;
glm::vec2 _size;
Origin _origin;
bool _planeIsDirty;
ghoul::opengl::ProgramObject* _shader;
bool _programIsDirty;
bool _textureIsDirty;
ghoul::opengl::Texture* _texture;
GLuint _quad;
GLuint _vertexPositionBuffer;