From: <ar...@us...> - 2006-08-16 22:37:14
|
Revision: 3 Author: aronb Date: 2006-08-16 15:37:08 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/pydemeter/?rev=3&view=rev Log Message: ----------- - Removing old qt code. Modified Paths: -------------- trunk/src/test/hellogl.py Modified: trunk/src/test/hellogl.py =================================================================== --- trunk/src/test/hellogl.py 2006-08-16 21:51:31 UTC (rev 2) +++ trunk/src/test/hellogl.py 2006-08-16 22:37:08 UTC (rev 3) @@ -28,54 +28,19 @@ self.glWidget = GLWidget() - self.xSlider = self.createSlider(QtCore.SIGNAL("xRotationChanged"), - self.glWidget.setXRotation) - self.ySlider = self.createSlider(QtCore.SIGNAL("yRotationChanged"), - self.glWidget.setYRotation) - self.zSlider = self.createSlider(QtCore.SIGNAL("zRotationChanged"), - self.glWidget.setZRotation) mainLayout = QtGui.QHBoxLayout() mainLayout.addWidget(self.glWidget) - mainLayout.addWidget(self.xSlider) - mainLayout.addWidget(self.ySlider) - mainLayout.addWidget(self.zSlider) self.setLayout(mainLayout) - self.xSlider.setValue(15 * 16) - self.ySlider.setValue(345 * 16) - self.zSlider.setValue(0 * 16) - self.setWindowTitle(self.tr("Hello GL")) - def createSlider(self, changedSignal, setterSlot): - slider = QtGui.QSlider(QtCore.Qt.Vertical) - - slider.setRange(0, 360 * 16) - slider.setSingleStep(16) - slider.setPageStep(15 * 16) - slider.setTickInterval(15 * 16) - slider.setTickPosition(QtGui.QSlider.TicksRight) - - self.glWidget.connect(slider, QtCore.SIGNAL("valueChanged(int)"), setterSlot) - self.connect(self.glWidget, changedSignal, slider, QtCore.SLOT("setValue(int)")) - - return slider - - class GLWidget(QtOpenGL.QGLWidget): def __init__(self, parent=None): QtOpenGL.QGLWidget.__init__(self, parent) self.setFocusPolicy(QtCore.Qt.StrongFocus) - self.object = 0 - self.xRot = 0 - self.yRot = 0 - self.zRot = 0 - self.lastPos = QtCore.QPoint() - self.trolltechGreen = QtGui.QColor.fromCmykF(0.40, 0.0, 1.0, 0.0) - self.trolltechPurple = QtGui.QColor.fromCmykF(0.39, 0.39, 0.0, 0.0) # The "detail level" of the terrain - higher values will render faster but yield less visual quality self.mThreshold = 30.0; @@ -130,52 +95,15 @@ # self.mManager.keyPress(key,0,0) self.updateGL() - def xRotation(self): - return self.xRot - - def yRotation(self): - return self.yRot - - def zRotation(self): - return self.zRot - def minimumSizeHint(self): return QtCore.QSize(50, 50) def sizeHint(self): return QtCore.QSize(400, 400) - def setXRotation(self, angle): - angle = self.normalizeAngle(angle) - if angle != self.xRot: - self.xRot = angle - self.emit(QtCore.SIGNAL("xRotationChanged"), angle) - self.updateGL() + hack = None - def setYRotation(self, angle): - angle = self.normalizeAngle(angle) - if angle != self.yRot: - self.yRot = angle - self.emit(QtCore.SIGNAL("yRotationChanged"), angle) - self.updateGL() - - def setZRotation(self, angle): - angle = self.normalizeAngle(angle) - if angle != self.zRot: - self.zRot = angle - self.emit(QtCore.SIGNAL("zRotationChanged"), angle) - self.updateGL() - def initializeGL(self): - #self.qglClearColor(self.trolltechPurple.dark()) - #self.object = self.makeObject() - #GL.glShadeModel(GL.GL_FLAT) - #GL.glEnable(GL.GL_DEPTH_TEST) - #GL.glEnable(GL.GL_CULL_FACE) - self.setupDemeter() - - hack = None - def setupDemeter(self): global terrain global camera global cameraPosition @@ -207,7 +135,7 @@ (width, height) = tex_loader.LoadTerrainTexture("/home/aronb/Source/demeter.4.0/DemeterSampleData/RaidTexture.png", terrain) #(width, height) = tex_loader.LoadTerrainTexture("/home/aronb/Source/demeter.4.0/DemeterSampleData/arctica.png", terrain) - hack = tex_loader.LoadMasks(terrain, "/home/aronb/Source/demeter.4.0/DemeterSampleData/RaidMask.png", + tex_loader.LoadMasks(terrain, "/home/aronb/Source/demeter.4.0/DemeterSampleData/RaidMask.png", "/home/aronb/Source/demeter.4.0/DemeterSampleData/granite19.png", "/home/aronb/Source/demeter.4.0/DemeterSampleData/grassDetail.png", "/home/aronb/Source/demeter.4.0/DemeterSampleData/road2.png") @@ -299,96 +227,8 @@ dx = event.x() - self.lastPos.x() dy = event.y() - self.lastPos.y() - if event.buttons() & QtCore.Qt.LeftButton: - self.setXRotation(self.xRot + 8 * dy) - self.setYRotation(self.yRot + 8 * dx) - elif event.buttons() & QtCore.Qt.RightButton: - self.setXRotation(self.xRot + 8 * dy) - self.setZRotation(self.zRot + 8 * dx) - self.lastPos = QtCore.QPoint(event.pos()) - def makeObject(self): - genList = GL.glGenLists(1) - GL.glNewList(genList, GL.GL_COMPILE) - - GL.glBegin(GL.GL_QUADS) - - x1 = +0.06 - y1 = -0.14 - x2 = +0.14 - y2 = -0.06 - x3 = +0.08 - y3 = +0.00 - x4 = +0.30 - y4 = +0.22 - - self.quad(x1, y1, x2, y2, y2, x2, y1, x1) - self.quad(x3, y3, x4, y4, y4, x4, y3, x3) - - self.extrude(x1, y1, x2, y2) - self.extrude(x2, y2, y2, x2) - self.extrude(y2, x2, y1, x1) - self.extrude(y1, x1, x1, y1) - self.extrude(x3, y3, x4, y4) - self.extrude(x4, y4, y4, x4) - self.extrude(y4, x4, y3, x3) - - Pi = 3.14159265358979323846 - NumSectors = 200 - - for i in range(NumSectors): - angle1 = (i * 2 * Pi) / NumSectors - x5 = 0.30 * math.sin(angle1) - y5 = 0.30 * math.cos(angle1) - x6 = 0.20 * math.sin(angle1) - y6 = 0.20 * math.cos(angle1) - - angle2 = ((i + 1) * 2 * Pi) / NumSectors - x7 = 0.20 * math.sin(angle2) - y7 = 0.20 * math.cos(angle2) - x8 = 0.30 * math.sin(angle2) - y8 = 0.30 * math.cos(angle2) - - self.quad(x5, y5, x6, y6, x7, y7, x8, y8) - - self.extrude(x6, y6, x7, y7) - self.extrude(x8, y8, x5, y5) - - GL.glEnd() - GL.glEndList() - - return genList - - def quad(self, x1, y1, x2, y2, x3, y3, x4, y4): - self.qglColor(self.trolltechGreen) - - GL.glVertex3d(x1, y1, -0.05) - GL.glVertex3d(x2, y2, -0.05) - GL.glVertex3d(x3, y3, -0.05) - GL.glVertex3d(x4, y4, -0.05) - - GL.glVertex3d(x4, y4, +0.05) - GL.glVertex3d(x3, y3, +0.05) - GL.glVertex3d(x2, y2, +0.05) - GL.glVertex3d(x1, y1, +0.05) - - def extrude(self, x1, y1, x2, y2): - self.qglColor(self.trolltechGreen.dark(250 + int(100 * x1))) - - GL.glVertex3d(x1, y1, +0.05) - GL.glVertex3d(x2, y2, +0.05) - GL.glVertex3d(x2, y2, -0.05) - GL.glVertex3d(x1, y1, -0.05) - - def normalizeAngle(self, angle): - while angle < 0: - angle += 360 * 16 - while angle > 360 * 16: - angle -= 360 * 16 - return angle - - if __name__ == '__main__': app = QtGui.QApplication(sys.argv) window = Window() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |