diff --git a/src/app/qtkscene.cpp b/src/app/qtkscene.cpp index 4fe51e9..4322432 100644 --- a/src/app/qtkscene.cpp +++ b/src/app/qtkscene.cpp @@ -482,15 +482,9 @@ void QtkScene::update() myCube->getTransform().rotate(-0.75f, 0.0f, 1.0f, 0.0f); } - // Helper lambda to set the light position used by GLSL shaders on the model. - // TODO: This could be a helper function on the Model class. - auto setLightPosition = [](const std::string & lightName, Model * model) { - - }; - QMatrix4x4 posMatrix; if (auto alien = getModel("alienTest"); alien) { - setLightPosition("alienTestLight", alien); + alien->setLightPosition("alienTestLight"); alien->setUniform("uCameraPosition", cameraPosition); posMatrix = alien->getTransform().toMatrix(); @@ -502,7 +496,7 @@ void QtkScene::update() } if (auto spartan = getModel("spartanTest"); spartan) { - setLightPosition("spartanTestLight", spartan); + spartan->setLightPosition("spartanTestLight"); spartan->setUniform("uCameraPosition", cameraPosition); posMatrix = spartan->getTransform().toMatrix(); @@ -514,7 +508,7 @@ void QtkScene::update() } if (auto phong = getModel("testPhong"); phong) { - setLightPosition("testLight", phong); + phong->setLightPosition("testLight"); phong->getTransform().rotate(0.75f, 1.0f, 0.5f, 0.0f); phong->bindShaders(); diff --git a/src/designer-plugins/toolbox.h b/src/designer-plugins/toolbox.h index 2ab4fbd..bf2ce54 100644 --- a/src/designer-plugins/toolbox.h +++ b/src/designer-plugins/toolbox.h @@ -121,7 +121,7 @@ namespace Qtk explicit SpinBox3D(QWidget * parent, const char * l = "SpinBox3D:"); /// The main layout for the SpinBox3D widget. - QHBoxLayout * layout {this}; + QHBoxLayout * layout; /// Label for the SpinBox3D. QLabel * label;