Changeset 9e4e21 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp

Timestamp:

Aug 9, 2017, 10:20:26 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued

Children:

78830b

Parents:

5bbaca

git-author:

Frederik Heber <frederik.heber@…> (08/08/17 21:26:57)

git-committer:

Frederik Heber <frederik.heber@…> (08/09/17 10:20:26)

Message:

Arrows display velocity and force of each atom.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp

@@ -61 +61 @@
 QGLMaterial *GLMoleculeObject::m_selectionMaterial = NULL;
 QGLMaterial *GLMoleculeObject::m_selectionBoxMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_velocityMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_forceMaterial = NULL;
 
 QGLSceneNode *GLMoleculeObject::meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
 QGLSceneNode *GLMoleculeObject::meshSphere[GLMoleculeObject::DETAILTYPES_MAX];
 QGLSceneNode *GLMoleculeObject::meshCylinder[GLMoleculeObject::DETAILTYPES_MAX];
+QGLSceneNode *GLMoleculeObject::meshArrow[GLMoleculeObject::DETAILTYPES_MAX];
 
 double GLMoleculeObject::detailMinDistance[GLMoleculeObject::DETAILTYPES_MAX] = {0, 15, 30, 42};
@@ -309 +312 @@
     m_selectionBoxMaterial->setEmittedLight( QColor(155, 50, 50) );
   }
+  if (!m_velocityMaterial){
+    m_velocityMaterial = new QGLMaterial(NULL);
+    QColor colorvelocity(50,50,255,255);
+    m_velocityMaterial->setColor(colorvelocity);
+  }
+  if (!m_forceMaterial){
+    m_forceMaterial = new QGLMaterial(NULL);
+    QColor colorforce(50,255,50,255);
+    m_forceMaterial->setColor(colorforce);
+  }
 }