OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

0024354: TKOpenGl - location modification of multi-connected shape has no effect when object is drawn by GLSL program

Browse Source
This commit is contained in:
duv 2014-03-18 15:22:31 +04:00 committed by bugmaster
parent 30194ce331
commit ca1028006d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenGl/OpenGl_ShaderStates.cxx
View File

@ -22,7 +22,8 @@
// purpose : Creates new OCCT state // purpose : Creates new OCCT state
// ======================================================================= // =======================================================================
OpenGl_StateInterface::OpenGl_StateInterface() OpenGl_StateInterface::OpenGl_StateInterface()
: myIndex (0) : myIndex (0),
myNextIndex (1)
{ {
// //
} }
@ -42,7 +43,9 @@ Standard_Size OpenGl_StateInterface::Index() const
// ======================================================================= // =======================================================================
void OpenGl_StateInterface::Update() void OpenGl_StateInterface::Update()
{ {
++myIndex; myStateStack.Push (myIndex);
myIndex = myNextIndex;
++myNextIndex;
} }
// ======================================================================= // =======================================================================
@ -51,9 +54,14 @@ void OpenGl_StateInterface::Update()
// ======================================================================= // =======================================================================
void OpenGl_StateInterface::Revert() void OpenGl_StateInterface::Revert()
{ {
if (myIndex > 0) if (!myStateStack.IsEmpty())
{ {
--myIndex; myIndex = myStateStack.Top();
myStateStack.Pop();
}
else
{
myIndex = 0;
} }
} }

6
src/OpenGl/OpenGl_ShaderStates.hxx
View File

@ -21,6 +21,8 @@
#include <OpenGl_Element.hxx> #include <OpenGl_Element.hxx>
#include <OpenGl_Light.hxx> #include <OpenGl_Light.hxx>
#include <NCollection_Stack.hxx>
//! Defines interface for OpenGL state. //! Defines interface for OpenGL state.
class OpenGl_StateInterface class OpenGl_StateInterface
{ {
@ -40,7 +42,9 @@ public:
protected: protected:
Standard_Size myIndex; //!< Current state index Standard_Size myIndex; //!< Current state index
Standard_Size myNextIndex; //!< Next state index
NCollection_Stack<Standard_Size> myStateStack; //!< Stack of previous states.
}; };