diff options
| -rw-r--r-- | Cura/gui/mainWindow.py | 9 | ||||
| -rw-r--r-- | Cura/gui/tools/superformula.py | 632 | ||||
| -rwxr-xr-x | package.sh | 2 |
3 files changed, 1 insertions, 642 deletions
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 1f1070eb7c..6481d4d914 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -17,7 +17,6 @@ from Cura.gui import sceneView #from Cura.gui.tools import batchRun from Cura.gui.util import dropTarget from Cura.gui.tools import minecraftImport -from Cura.gui.tools import superformula from Cura.util import profile from Cura.util import version from Cura.util import meshLoader @@ -119,8 +118,6 @@ class mainWindow(wx.Frame): if minecraftImport.hasMinecraft(): i = toolsMenu.Append(-1, 'Minecraft import...') self.Bind(wx.EVT_MENU, self.OnMinecraftImport, i) - i = toolsMenu.Append(-1, 'Super-shaper...') - self.Bind(wx.EVT_MENU, self.OnSuperformula, i) self.menubar.Append(toolsMenu, 'Tools') expertMenu = wx.Menu() @@ -403,12 +400,6 @@ class mainWindow(wx.Frame): mi.Centre() mi.Show(True) - def OnSuperformula(self, e): - sf = superformula.superformulaWindow(self) - #sf = superformula.superformulaEvolver(self) - sf.Centre() - sf.Show(True) - def OnCheckForUpdate(self, e): newVersion = version.checkForNewerVersion() if newVersion is not None: diff --git a/Cura/gui/tools/superformula.py b/Cura/gui/tools/superformula.py deleted file mode 100644 index 051cc6d552..0000000000 --- a/Cura/gui/tools/superformula.py +++ /dev/null @@ -1,632 +0,0 @@ -from __future__ import absolute_import -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" - -import wx -import math -import time -import random -import numpy - -from wx import glcanvas -import OpenGL -OpenGL.ERROR_CHECKING = False -from OpenGL.GL import * -from OpenGL.GLU import * - -from Cura.gui.util import opengl -from Cura.util import mesh -from Cura.util import meshLoader -from Cura.util import machineCom - -class superShape(object): - def __init__(self, a1, b1, m1, n11, n21, n31, a2, b2, m2, n12, n22, n32): - self._a1 = a1 - self._b1 = b1 - self._m1 = math.floor(m1) - self._n11 = n11 - self._n21 = n21 - self._n31 = n31 - self._a2 = a2 - self._b2 = b2 - self._m2 = m2 - self._n12 = n12 - self._n22 = n22 - self._n32 = n32 - - points = [] - cnt = 64 - for n in xrange(-cnt, cnt): - row = [] - points.append(row) - f1 = n * math.pi / cnt - try: - r1 = math.pow((math.pow(abs(math.cos(m1*f1/4)/a1),n21) + math.pow(abs(math.sin(m1*f1/4)/b1), n31)), -(1/n11)) - except: - r1 = 1.0 - for m in xrange(0, cnt): - f2 = m * math.pi / ((cnt*2) - 2) - try: - r2 = math.pow((math.pow(abs(math.cos(m2*f2/4)/a2),n22) + math.pow(abs(math.sin(m2*f2/4)/b2), n32)), -(1/n12)) - except: - r2 = 1.0 - - x = r1 * math.cos(f1) * r2 * math.cos(f2) - y = r1 * math.sin(f1) * r2 * math.cos(f2) - z = r2 * math.sin(f2) - - row.append([x,y,z]) - - self._obj = mesh.printableObject("super") - objMesh = self._obj._addMesh() - objMesh._prepareFaceCount(len(points) * (len(points[0]) - 1) * 2) - - for n in xrange(-1, len(points) - 1): - row1 = points[n] - row2 = points[n+1] - for m in xrange(0, len(row1) - 1): - p0 = row1[m] - p1 = row1[m+1] - p2 = row2[m] - p3 = row2[m+1] - - objMesh._addFace(p0[0], p0[1], p0[2], p2[0], p2[1], p2[2], p1[0], p1[1], p1[2]) - objMesh._addFace(p1[0], p1[1], p1[2], p2[0], p2[1], p2[2], p3[0], p3[1], p3[2]) - - self._obj._postProcessAfterLoad() - - def isValid(self): - size = self._obj.getSize() - if size[0] / size[2] > 10: - return False - return True - - def draw(self): - for m in self._obj._meshList: - if m.vbo is None: - m.vbo = opengl.GLVBO(m.vertexes, m.normal) - m.vbo.render() - -class superformulaEvolver(wx.Frame): - def __init__(self, parent): - super(superformulaEvolver, self).__init__(parent, title='Cura - Superformula') - self._rotate = 0.0 - self._t0 = time.time() - self._timeout = 0.0 - self._lampState = 0 - self._lampSpeed = 3 - self._lampUpdateTime = time.time() - self._buttonDown = False - self._doPrint = False - - sizer = wx.BoxSizer() - self.SetSizer(sizer) - - attribList = (glcanvas.WX_GL_RGBA, glcanvas.WX_GL_DOUBLEBUFFER, glcanvas.WX_GL_DEPTH_SIZE, 24, glcanvas.WX_GL_STENCIL_SIZE, 8) - self._glCanvas = glcanvas.GLCanvas(self, style=wx.WANTS_CHARS, attribList = attribList) - self._glCanvas.SetMinSize((800,600)) - sizer.Add(self._glCanvas, 1, flag=wx.EXPAND) - self._context = glcanvas.GLContext(self._glCanvas) - - wx.EVT_PAINT(self._glCanvas, self._OnPaint) - wx.EVT_SIZE(self._glCanvas, self._OnSize) - wx.EVT_ERASE_BACKGROUND(self._glCanvas, self._OnEraseBackground) - wx.EVT_IDLE(self, self._OnIdle) - - wx.EVT_LEFT_DOWN(self._glCanvas, self._OnMouseDown) - wx.EVT_MOTION(self._glCanvas, self._OnMouseMotion) - wx.EVT_CHAR(self._glCanvas, self._OnKeyChar) - - self._hover = 6 - self._shapes = [None] * 12 - self._releaseList = [] - - self._randomize() - - #style = self.GetWindowStyle() - #self.SetWindowStyle(style | wx.STAY_ON_TOP) - #self.Maximize() - self.ShowFullScreen(True, wx.FULLSCREEN_ALL) - - self._comm = None - self._comm = machineCom.MachineCom(callbackObject=self) - - def mcLog(self, message): - wx.CallAfter(self.SetTitle, message) - print message.strip() - - def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp): - pass - - def mcStateChange(self, state): - if self._comm is None: - return - if self._comm.isClosedOrError(): - self._comm.close() - self._comm = machineCom.MachineCom(callbackObject=self) - - def mcMessage(self, message): - cmd = message.strip() - if cmd == 'D0': - self._lampState = 127 - self._lampSpeed = 25 - self._comm.sendCommand('M42 S127') - self._buttonDown = True - elif cmd == 'U0': - self._buttonDown = False - if self._lampSpeed < 10: - wx.CallAfter(self._OnKey, wx.WXK_SPACE) - else: - wx.CallAfter(self._OnKey, ord('z')) - self._lampSpeed = 3 - elif cmd == 'D1' and not self._comm.isPrinting(): - wx.CallAfter(self._OnKey, wx.WXK_DOWN) - elif cmd == 'D2' and not self._comm.isPrinting(): - wx.CallAfter(self._OnKey, wx.WXK_LEFT) - elif cmd == 'D3' and not self._comm.isPrinting(): - wx.CallAfter(self._OnKey, wx.WXK_UP) - elif cmd == 'D4' and not self._comm.isPrinting(): - wx.CallAfter(self._OnKey, wx.WXK_RIGHT) - - def mcProgress(self, lineNr): - pass - - def mcZChange(self, newZ): - pass - - def _OnKeyChar(self, e): - self._OnKey(e.GetKeyCode()) - - def _OnKey(self, code): - self._timeout = 0.0 - if code == wx.WXK_LEFT: - if self._hover % 4 != 0: - self._hover -= 1 - elif code == wx.WXK_RIGHT: - if self._hover % 4 != 3: - self._hover += 1 - elif code == wx.WXK_UP: - if self._hover / 4 != 2: - self._hover += 4 - elif code == wx.WXK_DOWN: - if self._hover / 4 != 0: - self._hover -= 4 - elif code == wx.WXK_SPACE: - self._select() - elif code == ord('z'): - hole = meshLoader.loadMeshes('C:/Models/Delicate_Stubby_Ring-A-Thing_Sized/StubbyPinHoleNegFlat.stl')[0] - v = hole._meshList[0].vertexes * 1.03 - v[::,1] = hole._meshList[0].vertexes[::,2] - v[::,2] = hole._meshList[0].vertexes[::,1] - v -= numpy.array([0,0,15], numpy.float32) - numpy.clip(v, numpy.array([-100,-100,0], numpy.float32), numpy.array([100,100,100], numpy.float32), v) - - shape = self._shapes[self._hover] - scale = 1.0/numpy.max(shape._obj.getSize()) * 40 - - sv = shape._obj._meshList[0].vertexes * scale - - obj = mesh.printableObject("super") - m = obj._addMesh() - m._prepareFaceCount(shape._obj._meshList[0].vertexCount / 3 + hole._meshList[0].vertexCount / 3) - for n in xrange(0, shape._obj._meshList[0].vertexCount): - l = numpy.linalg.norm(sv[n]) - if l < 6.5: - sv[n] *= 6.5 / l - m.vertexes = numpy.concatenate((sv, v)) - m.vertexCount = shape._obj._meshList[0].vertexCount + hole._meshList[0].vertexCount - obj._postProcessAfterLoad() - self.GetParent().scene.OnDeleteAll(None) - self.GetParent().scene._scene.add(obj) - self.GetParent().scene.sceneUpdated() - self.GetParent().scene._updateSliceProgress(0, False) - self._doPrint = True - elif code == ord('c'): - self._comm.cancelPrint() - elif code == ord('r'): - self._randomize() - - def _OnMouseMotion(self, e): - size = self._glCanvas.GetSize() - self._hover = e.GetX() / (size.GetWidth() / 4) + (size.GetHeight() - e.GetY()) / (size.GetHeight() / 3) * 4 - - def _OnMouseDown(self, e): - self._timeout = 0.0 - self._select() - - def _select(self): - shape = self._shapes[self._hover] - for n in xrange(0, len(self._shapes)): - if n == self._hover: - continue - for m in self._shapes[n]._obj._meshList: - if m.vbo is not None: - self._releaseList.append(m.vbo) - f = 0.5 + n * 0.1 - update = True - while update: - self._shapes[n] = superShape( - shape._a1 + random.uniform(-f, f) / 2.0, - shape._b1 + random.uniform(-f, f) / 2.0, - shape._m1 + random.uniform(-f, f) * 2.0, - shape._n11 + random.uniform(-f, f), - shape._n21 + random.uniform(-f, f), - shape._n31 + random.uniform(-f, f), - shape._a2 + random.uniform(-f, f) / 2.0, - shape._b2 + random.uniform(-f, f) / 2.0, - shape._m2 + random.uniform(-f, f), - shape._n12 + random.uniform(-f, f), - shape._n22 + random.uniform(-f, f), - shape._n32 + random.uniform(-f, f)) - update = not self._shapes[n].isValid() - - def _randomize(self): - for shape in self._shapes: - if shape is not None: - for m in shape._obj._meshList: - if m.vbo is not None: - self._releaseList.append(m.vbo) - for n in xrange(0, len(self._shapes)): - update = True - while update: - self._shapes[n] = superShape( - random.uniform(0.5, 5.0), - random.uniform(0.5, 5.0), - random.uniform(0.5, 20.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 5.0), - random.uniform(0.5, 5.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 10.0), - random.uniform(0.5, 10.0)) - update = not self._shapes[n].isValid() - - def _OnEraseBackground(self,event): - #Workaround for windows background redraw flicker. - pass - - def _OnSize(self, e): - self.Refresh() - - def _OnIdle(self, e): - self._glCanvas.Refresh() - - def _OnPaint(self, e): - dc = wx.PaintDC(self._glCanvas) - - if time.time() > self._lampUpdateTime: - self._lampUpdateTime = time.time() + 0.05 - if self._comm.isOperational(): - self._lampState += self._lampSpeed - if self._lampState > 255: - self._lampState -= 256 - if self._buttonDown: - self._lampSpeed = 20 - if self._lampState < 127: - brightness = self._lampState - else: - brightness = 255 - self._lampState - if not self._comm.isPrinting(): - self._comm.sendCommand('M42 S%d' % (brightness)) - - if self.GetParent().scene._gcode is not None and self.GetParent().scene._gcode.filename is not None and self._doPrint and not self._comm.isPrinting(): - self._doPrint = False - gcodeList = ["M110", "M42 S0"] - for line in open(self.GetParent().scene._gcode.filename, 'r'): - if ';' in line: - line = line[0:line.find(';')] - line = line.strip() - if len(line) > 0: - gcodeList.append(line) - print len(gcodeList) - self._comm.printGCode(gcodeList) - - self._glCanvas.SetCurrent(self._context) - for obj in self._releaseList: - obj.release() - self._releaseList = [] - - size = self._glCanvas.GetSize() - glViewport(0, 0, size.GetWidth(), size.GetHeight()) - glLoadIdentity() - - glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0]) - - glDisable(GL_RESCALE_NORMAL) - glDisable(GL_LIGHTING) - glDisable(GL_LIGHT0) - glEnable(GL_DEPTH_TEST) - glDisable(GL_CULL_FACE) - glDisable(GL_BLEND) - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) - - glClearColor(0.0, 0.0, 0.0, 1.0) - glClearStencil(0) - glClearDepth(1.0) - - glMatrixMode(GL_PROJECTION) - glLoadIdentity() - aspect = float(size.GetWidth()) / float(size.GetHeight()) - gluPerspective(30.0, aspect, 1.0, 1000.0) - - glMatrixMode(GL_MODELVIEW) - glLoadIdentity() - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT) - - glTranslate(0,0,-2.0) - glRotate(-45 - math.sin(self._rotate/50.0) * 30, 1, 0, 0) - glRotate(self._rotate, 0, 0, 1) - self._rotate += (time.time() - self._t0) * 20 - self._timeout += time.time() - self._t0 - if self._timeout > 60: - self._timeout = 0.0 - self._randomize() - self._t0 = time.time() - - glEnable(GL_LIGHTING) - glEnable(GL_LIGHT0) - glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0]) - glLightfv(GL_LIGHT0, GL_DIFFUSE, [0.8,1.0,0.8,0]) - glLightfv(GL_LIGHT0, GL_AMBIENT, [0.3,0.3,0.3,0]) - glEnable(GL_LIGHT1) - glLightfv(GL_LIGHT1, GL_POSITION, [1.2, 0.2, 0.2, 0.0]) - glLightfv(GL_LIGHT1, GL_DIFFUSE, [0.5,0.3,0.2,0]) - glLightfv(GL_LIGHT1, GL_AMBIENT, [0.0,0.0,0.0,0]) - - if self._comm.isPrinting(): - self._timeout = 0 - shape = self._shapes[self._hover] - scale = 1.0/numpy.max(shape._obj.getSize()) - glPushMatrix() - glScalef(scale, scale, scale) - glTranslate(0,0,-shape._obj.getSize()[2] / 2.0) - glEnable(GL_NORMALIZE) - shape.draw() - glPopMatrix() - else: - for n in xrange(0, len(self._shapes)): - shape = self._shapes[n] - scale = 1.0/numpy.max(shape._obj.getSize()) - glPushMatrix() - glScalef(scale, scale, scale) - glTranslate(0,0,-shape._obj.getSize()[2] / 2.0) - glEnable(GL_NORMALIZE) - glViewport(size.GetWidth() / 4 * (n % 4), size.GetHeight() / 3 * (n / 4), size.GetWidth() / 4, size.GetHeight() / 3) - shape.draw() - glPopMatrix() - - if n == self._hover: - glDisable(GL_LIGHTING) - glPushMatrix() - glLoadIdentity() - glBegin(GL_LINE_LOOP) - glVertex3f(-0.40, 0.25,-1) - glVertex3f( 0.40, 0.25,-1) - glVertex3f( 0.40,-0.25,-1) - glVertex3f(-0.40,-0.25,-1) - glEnd() - glPopMatrix() - glEnable(GL_LIGHTING) - - glFlush() - self._glCanvas.SwapBuffers() - -class superformulaWindow(wx.Frame): - def __init__(self, parent): - super(superformulaWindow, self).__init__(parent, title='Cura - Superformula') - self._rotate = 0.0 - self._t0 = time.time() - - self.panel = wx.Panel(self, -1) - self.SetSizer(wx.BoxSizer()) - self.GetSizer().Add(self.panel, 1, wx.EXPAND) - - sizer = wx.GridBagSizer(2, 2) - - sizer.Add(wx.StaticText(self.panel, -1, 'A1'), pos=(0,0)) - self.sliderA1 = wx.Slider(self.panel, -1, 10, 5, 50, size=(150, -1)) - sizer.Add(self.sliderA1, pos=(0,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'B1'), pos=(1,0)) - self.sliderB1 = wx.Slider(self.panel, -1, 10, 5, 50, size=(150, -1)) - sizer.Add(self.sliderB1, pos=(1,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'M1'), pos=(2,0)) - self.sliderM1 = wx.Slider(self.panel, -1, 50, 5, 200, size=(150, -1)) - sizer.Add(self.sliderM1, pos=(2,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N11'), pos=(3,0)) - self.sliderN11 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN11, pos=(3,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N21'), pos=(4,0)) - self.sliderN21 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN21, pos=(4,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N31'), pos=(5,0)) - self.sliderN31 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN31, pos=(5,1)) - - sizer.Add(wx.StaticText(self.panel, -1, 'A2'), pos=(6,0)) - self.sliderA2 = wx.Slider(self.panel, -1, 10, 5, 50, size=(150, -1)) - sizer.Add(self.sliderA2, pos=(6,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'B2'), pos=(7,0)) - self.sliderB2 = wx.Slider(self.panel, -1, 10, 5, 50, size=(150, -1)) - sizer.Add(self.sliderB2, pos=(7,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'M2'), pos=(8,0)) - self.sliderM2 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderM2, pos=(8,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N12'), pos=(9,0)) - self.sliderN12 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN12, pos=(9,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N22'), pos=(10,0)) - self.sliderN22 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN22, pos=(10,1)) - sizer.Add(wx.StaticText(self.panel, -1, 'N32'), pos=(11,0)) - self.sliderN32 = wx.Slider(self.panel, -1, 20, 5, 100, size=(150, -1)) - sizer.Add(self.sliderN32, pos=(11,1)) - - self.randomButton = wx.Button(self.panel, -1, 'Randomize') - sizer.Add(self.randomButton, pos=(12,1)) - self.addButton = wx.Button(self.panel, -1, 'Add to print') - sizer.Add(self.addButton, pos=(13,1)) - - attribList = (glcanvas.WX_GL_RGBA, glcanvas.WX_GL_DOUBLEBUFFER, glcanvas.WX_GL_DEPTH_SIZE, 32, glcanvas.WX_GL_STENCIL_SIZE, 8) - self._glCanvas = glcanvas.GLCanvas(self.panel, style=wx.WANTS_CHARS, attribList = attribList) - self._glCanvas.SetMinSize((800,600)) - sizer.Add(self._glCanvas, pos=(0,2), span=(14,1), flag=wx.EXPAND) - self._context = glcanvas.GLContext(self._glCanvas) - - sizer.AddGrowableRow(13) - sizer.AddGrowableCol(2) - self.panel.SetSizer(sizer) - self.Layout() - self.Fit() - - wx.EVT_PAINT(self._glCanvas, self._OnPaint) - wx.EVT_SIZE(self._glCanvas, self._OnSize) - wx.EVT_ERASE_BACKGROUND(self._glCanvas, self._OnEraseBackground) - wx.EVT_IDLE(self, self._OnIdle) - - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderA1) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderB1) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderM1) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN11) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN21) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN31) - - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderA2) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderB2) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderM2) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN12) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN22) - self.Bind(wx.EVT_SLIDER, lambda e: self._updateShape(), self.sliderN32) - - self.Bind(wx.EVT_BUTTON, lambda e: self.onRandom(), self.randomButton) - self.Bind(wx.EVT_BUTTON, lambda e: self.onAdd(), self.addButton) - - self._shape = None - self._releaseList = [] - self._updateShape() - - def onRandom(self): - update = True - while update: - update = False - self.sliderA1.SetValue(random.randint(self.sliderA1.GetMin(), self.sliderA1.GetMax())) - self.sliderB1.SetValue(random.randint(self.sliderB1.GetMin(), self.sliderB1.GetMax())) - self.sliderM1.SetValue(random.randint(self.sliderM1.GetMin(), self.sliderM1.GetMax())) - self.sliderN11.SetValue(random.randint(self.sliderN11.GetMin(), self.sliderN11.GetMax())) - self.sliderN21.SetValue(random.randint(self.sliderN21.GetMin(), self.sliderN21.GetMax())) - self.sliderN31.SetValue(random.randint(self.sliderN31.GetMin(), self.sliderN31.GetMax())) - self.sliderA2.SetValue(random.randint(self.sliderA2.GetMin(), self.sliderA2.GetMax())) - self.sliderB2.SetValue(random.randint(self.sliderB2.GetMin(), self.sliderB2.GetMax())) - self.sliderM2.SetValue(random.randint(self.sliderM2.GetMin(), self.sliderM2.GetMax())) - self.sliderN12.SetValue(random.randint(self.sliderN12.GetMin(), self.sliderN12.GetMax())) - self.sliderN22.SetValue(random.randint(self.sliderN22.GetMin(), self.sliderN22.GetMax())) - self.sliderN32.SetValue(random.randint(self.sliderN32.GetMin(), self.sliderN32.GetMax())) - self._updateShape() - if not self._shape.isValid(): - update = True - - def onAdd(self): - scale = 1.0/numpy.max(self._shape._obj.getSize()) * 50 - - obj = mesh.printableObject("super") - m = obj._addMesh() - m._prepareFaceCount(self._shape._obj._meshList[0].vertexCount / 3) - m.vertexes = self._shape._obj._meshList[0].vertexes * scale - m.vertexCount = self._shape._obj._meshList[0].vertexCount - obj._postProcessAfterLoad() - self.GetParent().scene._scene.add(obj) - self.GetParent().scene.sceneUpdated() - - def _updateShape(self): - if self._shape is not None: - for m in self._shape._obj._meshList: - if m.vbo is not None: - self._releaseList.append(m.vbo) - self._shape = superShape( - float(self.sliderA1.GetValue()) / 10.0, - float(self.sliderB1.GetValue()) / 10.0, - float(self.sliderM1.GetValue()) / 10.0, - - float(self.sliderN11.GetValue()) / 10.0, - float(self.sliderN21.GetValue()) / 10.0, - float(self.sliderN31.GetValue()) / 10.0, - - float(self.sliderA2.GetValue()) / 10.0, - float(self.sliderB2.GetValue()) / 10.0, - float(self.sliderM2.GetValue()) / 10.0, - - float(self.sliderN12.GetValue()) / 10.0, - float(self.sliderN22.GetValue()) / 10.0, - float(self.sliderN32.GetValue()) / 10.0, - ) - - def _OnEraseBackground(self,event): - #Workaround for windows background redraw flicker. - pass - - def _OnSize(self, e): - self.Refresh() - - def _OnIdle(self, e): - self._glCanvas.Refresh() - - def _OnPaint(self, e): - dc = wx.PaintDC(self._glCanvas) - - self._glCanvas.SetCurrent(self._context) - for obj in self._releaseList: - obj.release() - self._releaseList = [] - - size = self._glCanvas.GetSize() - glViewport(0, 0, size.GetWidth(), size.GetHeight()) - glLoadIdentity() - - glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0]) - - glDisable(GL_RESCALE_NORMAL) - glDisable(GL_LIGHTING) - glDisable(GL_LIGHT0) - glEnable(GL_DEPTH_TEST) - glDisable(GL_CULL_FACE) - glDisable(GL_BLEND) - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) - - glClearColor(0.0, 0.0, 0.0, 1.0) - glClearStencil(0) - glClearDepth(1.0) - - glMatrixMode(GL_PROJECTION) - glLoadIdentity() - aspect = float(size.GetWidth()) / float(size.GetHeight()) - gluPerspective(45.0, aspect, 1.0, 1000.0) - - glMatrixMode(GL_MODELVIEW) - glLoadIdentity() - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT) - - glTranslate(0,0,-2) - glRotate(-45 - math.sin(self._rotate/50.0) * 30, 1, 0, 0) - glRotate(self._rotate, 0, 0, 1) - self._rotate += (self._t0 - time.time()) * 20 - self._t0 = time.time() - - glEnable(GL_LIGHTING) - glEnable(GL_LIGHT0) - glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0]) - glLightfv(GL_LIGHT0, GL_DIFFUSE, [0.8,1.0,0.8,0]) - glLightfv(GL_LIGHT0, GL_AMBIENT, [0.3,0.3,0.3,0]) - glEnable(GL_LIGHT1) - glLightfv(GL_LIGHT1, GL_POSITION, [1.2, 0.2, 0.2, 0.0]) - glLightfv(GL_LIGHT1, GL_DIFFUSE, [0.5,0.3,0.2,0]) - glLightfv(GL_LIGHT1, GL_AMBIENT, [0.0,0.0,0.0,0]) - - scale = 1.0/numpy.max(self._shape._obj.getSize()) - glScalef(scale, scale, scale) - glEnable(GL_NORMALIZE) - - self._shape.draw() - - glFlush() - self._glCanvas.SwapBuffers() diff --git a/package.sh b/package.sh index 2ee7449a5b..79a9761adb 100755 --- a/package.sh +++ b/package.sh @@ -17,7 +17,7 @@ BUILD_TARGET=${1:-all} ##Do we need to create the final archive ARCHIVE_FOR_DISTRIBUTION=1 ##Which version name are we appending to the final archive -BUILD_NAME=13.06.3 +BUILD_NAME=13.06.4 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET} ##Which versions of external programs to use |