chiark / gitweb /
Have the shader editor refresh the load animation on change.
authordaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 08:59:07 +0000 (09:59 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 29 Mar 2013 08:59:07 +0000 (09:59 +0100)
Cura/gui/sceneView.py

index f90b766273e13ae792a137dd0595c720b865556f..8b68b6db81325131da232ff6707e4abbed2ede9d 100644 (file)
@@ -146,6 +146,8 @@ class SceneView(openglGui.glGuiPanel):
                if s.isValid():
                        self._objectLoadShader.release()
                        self._objectLoadShader = s
+                       for obj in self._scene.objects():
+                               obj._loadAnim = anim(1, 0, 1.5)
                        self.Refresh()
 
        def OnMouseDown(self,e):
@@ -366,7 +368,7 @@ void main(void)
                        if obj._loadAnim is None:
                                continue
                        self._objectLoadShader.setUniform('intensity', obj._loadAnim.getPosition())
-                       self._objectLoadShader.setUniform('scale', obj.getBoundaryCircle() / 20)
+                       self._objectLoadShader.setUniform('scale', obj.getBoundaryCircle() / 10)
                        self._renderObject(obj)
                self._objectLoadShader.unbind()
                glDisable(GL_BLEND)