Skip to content
Permalink
Browse files

Merge pull request #466 from invor/Compositing

Changed to glowl::GLSLProgram for MaterialCollection, removed old files
  • Loading branch information...
tobiasrau committed Nov 7, 2019
2 parents 8803d23 + c6520f0 commit 0c12d80e918c98088c71f725c052eed55ed9d820
@@ -18,6 +18,7 @@

#include "mesh.h"

#include "glowl/GLSLProgram.hpp"
#include "glowl/Texture.hpp"
#include "glowl/Texture2D.hpp"
#include "glowl/Texture2DArray.hpp"
@@ -27,7 +28,7 @@
namespace megamol {
namespace mesh {

typedef vislib::graphics::gl::GLSLGeometryShader Shader;
typedef glowl::GLSLProgram Shader;

class MESH_API GPUMaterialCollecton {
public:

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 0c12d80

Please sign in to comment.
You can’t perform that action at this time.