diff --git a/GUI/ba3d/ba3d/view/program.cpp b/GUI/ba3d/ba3d/view/program.cpp index fa3bdef42aa4a149db6e605db5c662493b604bda..e954f894249bc498201dae2bf6025b5dc32281e3 100644 --- a/GUI/ba3d/ba3d/view/program.cpp +++ b/GUI/ba3d/ba3d/view/program.cpp @@ -54,6 +54,7 @@ void Program::init() { bindAttributeLocation("vertex", 0); bindAttributeLocation("normal", 1); + bindAttributeLocation("axiscolor", 2); link(); @@ -65,6 +66,7 @@ void Program::init() { locColor = uniformLocation("color"); ambient = uniformLocation("ambient"); eye = uniformLocation("eye"); + locAxis = uniformLocation("axis"); release(); } @@ -76,7 +78,7 @@ void Program::set(Camera const& camera) { setUniformValue(eye, camera.getPos().eye); } -void Program::set(QColor const&color) { +void Program::set(QColor const& color) { setUniformValue(locColor, color); } @@ -88,4 +90,8 @@ void Program::setMatModel(QMatrix4x4 const& mat) { setUniformValue(locMatModel, mat); } +void Program::setAxis(bool const& axis_) { + setUniformValue(locAxis, axis_); +} + } // namespace RealSpace diff --git a/GUI/ba3d/ba3d/view/program.h b/GUI/ba3d/ba3d/view/program.h index a3548df95fd04ab1f1c26b063ffbd1355729adbd..74f9a258f589f0e5218d1c4bbfbb89dac95eb9be 100644 --- a/GUI/ba3d/ba3d/view/program.h +++ b/GUI/ba3d/ba3d/view/program.h @@ -37,10 +37,12 @@ private: void set(QColor const&); // object color void set(QMatrix4x4 const&); // set matObject void setMatModel(QMatrix4x4 const&); // set matModel + void setAxis(bool const&); bool doInit; int locMatProj, locMatModel, locMatObject; int locLightPos1, locColor, ambient, eye; + int locAxis; }; } // namespace RealSpace