Commit d7994bef authored by Maire Nicolas's avatar Maire Nicolas
Browse files

Oubli de modification de GLSLShader pour la mise à jour des uniforms de clipping.

Petites corrections au niveau de l'interface Qt.
parent 18afaf68
...@@ -97,8 +97,11 @@ void StageShader::button_compile() ...@@ -97,8 +97,11 @@ void StageShader::button_compile()
QString st2 = dynamic_cast<Utils::QT::uiDockInterface*>(dockWidget())->fragmentEdit->toPlainText(); QString st2 = dynamic_cast<Utils::QT::uiDockInterface*>(dockWidget())->fragmentEdit->toPlainText();
QString st3 = dynamic_cast<Utils::QT::uiDockInterface*>(dockWidget())->geometryEdit->toPlainText(); QString st3 = dynamic_cast<Utils::QT::uiDockInterface*>(dockWidget())->geometryEdit->toPlainText();
if (st1.toStdString().length() > 0)
m_shader->reloadVertexShaderFromMemory(st1.toStdString().c_str()); m_shader->reloadVertexShaderFromMemory(st1.toStdString().c_str());
if (st2.toStdString().length() > 0)
m_shader->reloadFragmentShaderFromMemory(st2.toStdString().c_str()); m_shader->reloadFragmentShaderFromMemory(st2.toStdString().c_str());
if (st3.toStdString().length() > 0)
m_shader->reloadGeometryShaderFromMemory(st3.toStdString().c_str()); m_shader->reloadGeometryShaderFromMemory(st3.toStdString().c_str());
m_shader->recompile(); m_shader->recompile();
......
...@@ -171,19 +171,6 @@ ...@@ -171,19 +171,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
...@@ -285,6 +285,9 @@ public: ...@@ -285,6 +285,9 @@ public:
*/ */
virtual void restoreUniformsAttribs() {CGoGNerr << "Warning restoreUniformsAttribs not implemented"<< CGoGNendl;} virtual void restoreUniformsAttribs() {CGoGNerr << "Warning restoreUniformsAttribs not implemented"<< CGoGNendl;}
virtual void updateClippingUniforms() {CGoGNerr << "Warning updateClippingUniforms not implemented"<< CGoGNendl;}
/** /**
* *
*/ */
......
...@@ -823,6 +823,8 @@ bool GLSLShader::recompile() ...@@ -823,6 +823,8 @@ bool GLSLShader::recompile()
restoreUniformsAttribs(); restoreUniformsAttribs();
updateClippingUniforms();
return true; return true;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment