adding cylinder and sphere windows

ScreamingUdder · May 31, 2019 · ea9f7c0 · ea9f7c0
1 parent 871d9b5
commit ea9f7c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 118 deletions.
diff --git a/cylinderwindow.py b/cylinderwindow.py
@@ -120,43 +120,10 @@ def createScene(self):
         # Material
         self.material = Qt3DExtras.QPhongMaterial(self.rootEntity)
 
-        # Torus
-        self.torusEntity = Qt3DCore.QEntity(self.rootEntity)
-        self.torusMesh = Qt3DExtras.QTorusMesh()
-        self.torusMesh.setRadius(5)
-        self.torusMesh.setMinorRadius(1)
-        self.torusMesh.setRings(100)
-        self.torusMesh.setSlices(20)
-
-        self.torusTransform = Qt3DCore.QTransform()
-        self.torusTransform.setScale3D(QVector3D(1.5, 1, 0.5))
-        self.torusTransform.setRotation(
-            QQuaternion.fromAxisAndAngle(QVector3D(1, 0, 0), 45)
-        )
-
-        self.torusEntity.addComponent(self.torusMesh)
-        self.torusEntity.addComponent(self.torusTransform)
-        self.torusEntity.addComponent(self.material)
-
-        # Sphere
-        self.sphereEntity = Qt3DCore.QEntity(self.rootEntity)
-        self.sphereMesh = Qt3DExtras.QSphereMesh()
-        self.sphereMesh.setRadius(3)
-
-        self.sphereTransform = Qt3DCore.QTransform()
-        self.controller = OrbitTransformController(self.sphereTransform)
-        self.controller.setTarget(self.sphereTransform)
-        self.controller.setRadius(20)
-
-        self.sphereRotateTransformAnimation = QPropertyAnimation(self.sphereTransform)
-        self.sphereRotateTransformAnimation.setTargetObject(self.controller)
-        self.sphereRotateTransformAnimation.setPropertyName(b"angle")
-        self.sphereRotateTransformAnimation.setStartValue(0)
-        self.sphereRotateTransformAnimation.setEndValue(360)
-        self.sphereRotateTransformAnimation.setDuration(10000)
-        self.sphereRotateTransformAnimation.setLoopCount(-1)
-        self.sphereRotateTransformAnimation.start()
-
-        self.sphereEntity.addComponent(self.sphereMesh)
-        self.sphereEntity.addComponent(self.sphereTransform)
-        self.sphereEntity.addComponent(self.material)
+
+        self.cylinderEntity = Qt3DCore.QEntity(self.rootEntity)
+        self.cylinderMesh = Qt3DExtras.QCylinderMesh()
+        self.cylinderMesh.setLength(10)
+        self.cylinderMesh.setRadius(5)
+        self.cylinderEntity.addComponent(self.cylinderMesh)
+        self.cylinderEntity.addComponent(self.material)
diff --git a/spherewindow.py b/spherewindow.py
@@ -50,51 +50,6 @@
 from PySide2.Qt3DExtras import Qt3DExtras
 
 
-class OrbitTransformController(QObject):
-    def __init__(self, parent):
-        super(OrbitTransformController, self).__init__(parent)
-        self._target = None
-        self._matrix = QMatrix4x4()
-        self._radius = 1
-        self._angle = 0
-
-    def setTarget(self, t):
-        self._target = t
-
-    def getTarget(self):
-        return self._target
-
-    def setRadius(self, radius):
-        if self._radius != radius:
-            self._radius = radius
-            self.updateMatrix()
-            self.radiusChanged.emit()
-
-    def getRadius(self):
-        return self._radius
-
-    def setAngle(self, angle):
-        if self._angle != angle:
-            self._angle = angle
-            self.updateMatrix()
-            self.angleChanged.emit()
-
-    def getAngle(self):
-        return self._angle
-
-    def updateMatrix(self):
-        self._matrix.setToIdentity()
-        self._matrix.rotate(self._angle, QVector3D(0, 1, 0))
-        self._matrix.translate(self._radius, 0, 0)
-        if self._target is not None:
-            self._target.setMatrix(self._matrix)
-
-    angleChanged = Signal()
-    radiusChanged = Signal()
-    angle = Property(float, getAngle, setAngle, notify=angleChanged)
-    radius = Property(float, getRadius, setRadius, notify=radiusChanged)
-
-
 class SphereWindow(Qt3DExtras.Qt3DWindow):
     def __init__(self):
         super(SphereWindow, self).__init__()
@@ -120,43 +75,10 @@ def createScene(self):
         # Material
         self.material = Qt3DExtras.QPhongMaterial(self.rootEntity)
 
-        # Torus
-        self.torusEntity = Qt3DCore.QEntity(self.rootEntity)
-        self.torusMesh = Qt3DExtras.QTorusMesh()
-        self.torusMesh.setRadius(5)
-        self.torusMesh.setMinorRadius(1)
-        self.torusMesh.setRings(100)
-        self.torusMesh.setSlices(20)
-
-        self.torusTransform = Qt3DCore.QTransform()
-        self.torusTransform.setScale3D(QVector3D(1.5, 1, 0.5))
-        self.torusTransform.setRotation(
-            QQuaternion.fromAxisAndAngle(QVector3D(1, 0, 0), 45)
-        )
-
-        self.torusEntity.addComponent(self.torusMesh)
-        self.torusEntity.addComponent(self.torusTransform)
-        self.torusEntity.addComponent(self.material)
-
         # Sphere
         self.sphereEntity = Qt3DCore.QEntity(self.rootEntity)
         self.sphereMesh = Qt3DExtras.QSphereMesh()
         self.sphereMesh.setRadius(3)
 
-        self.sphereTransform = Qt3DCore.QTransform()
-        self.controller = OrbitTransformController(self.sphereTransform)
-        self.controller.setTarget(self.sphereTransform)
-        self.controller.setRadius(20)
-
-        self.sphereRotateTransformAnimation = QPropertyAnimation(self.sphereTransform)
-        self.sphereRotateTransformAnimation.setTargetObject(self.controller)
-        self.sphereRotateTransformAnimation.setPropertyName(b"angle")
-        self.sphereRotateTransformAnimation.setStartValue(0)
-        self.sphereRotateTransformAnimation.setEndValue(360)
-        self.sphereRotateTransformAnimation.setDuration(10000)
-        self.sphereRotateTransformAnimation.setLoopCount(-1)
-        self.sphereRotateTransformAnimation.start()
-
         self.sphereEntity.addComponent(self.sphereMesh)
-        self.sphereEntity.addComponent(self.sphereTransform)
         self.sphereEntity.addComponent(self.material)