Tech ENABLE_COLOR_CLASSES set as default

This commit is contained in:
enricoturri1966 2022-01-14 08:19:00 +01:00
parent fab35e8aa4
commit 6201dad245
50 changed files with 18 additions and 1500 deletions

View file

@ -9,10 +9,8 @@
namespace Slic3r {
#if ENABLE_COLOR_CLASSES
class ColorRGB;
class ColorRGBA;
#endif // ENABLE_COLOR_CLASSES
class GLShaderProgram
{
@ -65,10 +63,8 @@ public:
void set_uniform(const char* name, const Matrix3f& value) const { set_uniform(get_uniform_location(name), value); }
void set_uniform(const char* name, const Vec3f& value) const { set_uniform(get_uniform_location(name), value); }
void set_uniform(const char* name, const Vec3d& value) const { set_uniform(get_uniform_location(name), value); }
#if ENABLE_COLOR_CLASSES
void set_uniform(const char* name, const ColorRGB& value) const { set_uniform(get_uniform_location(name), value); }
void set_uniform(const char* name, const ColorRGBA& value) const { set_uniform(get_uniform_location(name), value); }
#endif // ENABLE_COLOR_CLASSES
void set_uniform(int id, int value) const;
void set_uniform(int id, bool value) const;
@ -86,10 +82,8 @@ public:
void set_uniform(int id, const Matrix3f& value) const;
void set_uniform(int id, const Vec3f& value) const;
void set_uniform(int id, const Vec3d& value) const;
#if ENABLE_COLOR_CLASSES
void set_uniform(int id, const ColorRGB& value) const;
void set_uniform(int id, const ColorRGBA& value) const;
#endif // ENABLE_COLOR_CLASSES
// returns -1 if not found
int get_attrib_location(const char* name) const;