Changeset 72a4c1 for src/UIElements

Timestamp:

Jul 27, 2012, 2:29:50 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

22d99f

Parents:

b7b752

Message:

GL: using multiple levels of detail for the meshes

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (4 diffs)
• GLMoleculeObject.hpp (modified) (3 diffs)
• GLMoleculeObject_atom.cpp (modified) (1 diff)
• GLMoleculeObject_atom.hpp (modified) (1 diff)
• GLMoleculeObject_bond.cpp (modified) (1 diff)
• GLMoleculeObject_bond.hpp (modified) (1 diff)
• GLMoleculeObject_molecule.cpp (modified) (1 diff)
• GLMoleculeObject_molecule.hpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (5 diffs)
• GLWorldScene.hpp (modified) (2 diffs)
• GLWorldView.cpp (modified) (1 diff)

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

@@ -47 +47 @@
 
 
-GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+double GLMoleculeObject::detailMinDistance[GLMoleculeObject::DETAILTYPES_MAX] = {0, 15, 30, 42};
+
+GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh[], QObject *parent)
    : QObject(parent)
 {
    //mesh->setParent(this);
-   m_mesh = mesh;
+   for (int i=0;i<DETAILTYPES_MAX;i++)
+     m_mesh[i] = mesh[i];
    m_scale = 1.0f;
    m_scaleZ = 1.0f;
@@ -67 +70 @@
 {
    scene->setParent(this);
-   m_mesh = scene->mainNode();
+   m_mesh[0] = scene->mainNode();
+   m_mesh[1] = scene->mainNode();
+   m_mesh[2] = scene->mainNode();
    m_scale = 1.0f;
    m_scaleZ = 1.0f;
@@ -118 +123 @@
 }
 
-void GLMoleculeObject::draw(QGLPainter *painter)
+void GLMoleculeObject::draw(QGLPainter *painter, const QVector4D &cameraPlane)
 {
    // Position the model at its designated position, scale, and orientation.
@@ -154 +159 @@
 
    // Draw the geometry mesh.
-   m_mesh->draw(painter);
+   QVector4D pos4d(m_position, -1);
+   qreal distance = QVector4D::dotProduct(cameraPlane, pos4d);
+
+   if (distance > detailMinDistance[DETAIL_LOW])
+     m_mesh[DETAIL_LOW]->draw(painter);
+   else if (distance > detailMinDistance[DETAIL_MEDIUM])
+     m_mesh[DETAIL_MEDIUM]->draw(painter);
+   else if (distance > detailMinDistance[DETAIL_HIGH])
+     m_mesh[DETAIL_HIGH]->draw(painter);
+   else if (distance > detailMinDistance[DETAIL_HIGHEST])
+     m_mesh[DETAIL_HIGHEST]->draw(painter);
 
    // Draw a box around the mesh, if selected.

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

@@ -37 +37 @@
    friend class GLWorldScene;
 public:
-   explicit GLMoleculeObject(QGLSceneNode *mesh, QObject *parent=0);
+   explicit GLMoleculeObject(QGLSceneNode *mesh[], QObject *parent=0);
    explicit GLMoleculeObject(QGLAbstractScene *scene, QObject *parent=0);
    virtual ~GLMoleculeObject();
@@ -70 +70 @@
    void initStaticMaterials();
    void initialize(QGLView *view, QGLPainter *painter);
-   void draw(QGLPainter *painter);
+   void draw(QGLPainter *painter, const QVector4D &cameraPlane);
    void drawSelectionBox(QGLPainter *painter);
 
@@ -91 +91 @@
    static ElementMaterialMap ElementNoMaterialMap;
 
+public:
+   enum{DETAIL_HIGHEST, DETAIL_HIGH, DETAIL_MEDIUM, DETAIL_LOW, DETAILTYPES_MAX} DetailType;
+
 private:
 
-   QGLSceneNode *m_mesh;
+   static double detailMinDistance[DETAILTYPES_MAX];
+
+   QGLSceneNode *m_mesh[DETAILTYPES_MAX];
    QGLAbstractScene *m_scene;
    QVector3D m_position;

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

@@ -36 +36 @@
 #include "World.hpp"
 
-GLMoleculeObject_atom::GLMoleculeObject_atom(QGLSceneNode *mesh, QObject *parent, const atom *atomref) :
+GLMoleculeObject_atom::GLMoleculeObject_atom(QGLSceneNode *mesh[], QObject *parent, const atom *atomref) :
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_atom")+toString(atomref->getId())),

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp

@@ -27 +27 @@
   Q_OBJECT
 public:
-  GLMoleculeObject_atom(QGLSceneNode *mesh, QObject *parent, const atom *atomref);
+  GLMoleculeObject_atom(QGLSceneNode *mesh[], QObject *parent, const atom *atomref);
   virtual ~GLMoleculeObject_atom();
 

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

@@ -37 +37 @@
 #include "LinearAlgebra/Vector.hpp"
 
-GLMoleculeObject_bond::GLMoleculeObject_bond(QGLSceneNode *mesh, QObject *parent, const bond *bondref, const enum SideOfBond side) :
+GLMoleculeObject_bond::GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond *bondref, const enum SideOfBond side) :
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_bond")

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp

@@ -28 +28 @@
   enum SideOfBond { left, right };
 
-  GLMoleculeObject_bond(QGLSceneNode *mesh, QObject *parent, const bond *bondref, const enum SideOfBond side);
+  GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond *bondref, const enum SideOfBond side);
   virtual ~GLMoleculeObject_bond();
 

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

@@ -39 +39 @@
 #include "World.hpp"
 
-GLMoleculeObject_molecule::GLMoleculeObject_molecule(QGLSceneNode *mesh, QObject *parent, const molecule *molref) :
+GLMoleculeObject_molecule::GLMoleculeObject_molecule(QGLSceneNode *mesh[], QObject *parent, const molecule *molref) :
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_molecule")+toString(molref->getId())),

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

@@ -28 +28 @@
   Q_OBJECT
 public:
-  GLMoleculeObject_molecule(QGLSceneNode *mesh, QObject *parent, const molecule *molref);
+  GLMoleculeObject_molecule(QGLSceneNode *mesh[], QObject *parent, const molecule *molref);
   virtual ~GLMoleculeObject_molecule();
 

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

@@ -61 +61 @@
      hoverAtom(NULL)
 {
-  QGLBuilder builder0;
-  meshEmpty = builder0.finalizedSceneNode();
-  QGLBuilder builder1;
-  builder1 << QGLSphere(2.0, 5);
-  meshSphereHi = builder1.finalizedSceneNode();
-  QGLBuilder builder2;
-  builder2 << QGLSphere(2.0, 1);
-  meshSphereLo = builder2.finalizedSceneNode();
-  QGLBuilder builder3;
-  builder3 << QGLCylinder(.25,.25,1.0,16);
-  meshCylinderHi = builder3.finalizedSceneNode();
-  QGLBuilder builder4;
-  builder4 << QGLCylinder(.25,.25,1.0,16);
-  meshCylinderLo = builder4.finalizedSceneNode();
-
-  meshSphereHi->setOption(QGLSceneNode::CullBoundingBox, true);
-  meshSphereLo->setOption(QGLSceneNode::CullBoundingBox, true);
-  meshCylinderHi->setOption(QGLSceneNode::CullBoundingBox, true);
-  meshCylinderLo->setOption(QGLSceneNode::CullBoundingBox, true);
+  int sphereDetails[] = {5, 3, 2, 0};
+  int cylinderDetails[] = {16, 8, 6, 3};
+  for (int i=0;i<GLMoleculeObject::DETAILTYPES_MAX;i++){
+    QGLBuilder emptyBuilder;
+    meshEmpty[i] = emptyBuilder.finalizedSceneNode();
+    QGLBuilder sphereBuilder;
+    sphereBuilder << QGLSphere(2.0, sphereDetails[i]);
+    meshSphere[i] = sphereBuilder.finalizedSceneNode();
+    meshSphere[i]->setOption(QGLSceneNode::CullBoundingBox, true);
+    QGLBuilder cylinderBuilder;
+    cylinderBuilder << QGLCylinder(.25,.25,1.0,cylinderDetails[i]);
+    meshCylinder[i] = cylinderBuilder.finalizedSceneNode();
+    meshCylinder[i]->setOption(QGLSceneNode::CullBoundingBox, true);
+  }
 
   setSelectionMode(SelectAtom);
@@ -132 +127 @@
 {
   LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atom->getId())+".");
-  GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(meshSphereHi, this, _atom);
+  GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(meshSphere, this, _atom);
   AtomNodeMap::iterator iter = AtomsinSceneMap.find(_atom->getId());
   ASSERT(iter == AtomsinSceneMap.end(),
@@ -252 +247 @@
 #endif
   GLMoleculeObject_bond *bondObject =
-      new GLMoleculeObject_bond(meshCylinderHi, this, _bond, side);
+      new GLMoleculeObject_bond(meshCylinder, this, _bond, side);
   connect (
       bondObject, SIGNAL(BondRemoved(const atomId_t, const atomId_t)),
@@ -295 +290 @@
 }
 
-void GLWorldScene::draw(QGLPainter *painter) const
+void GLWorldScene::draw(QGLPainter *painter, const QVector4D &cameraPlane) const
 {
    // Draw all of the mesh objects that we have as children.
@@ -301 +296 @@
      GLMoleculeObject *meshobj = qobject_cast<GLMoleculeObject *>(obj);
        if (meshobj)
-         meshobj->draw(painter);
+         meshobj->draw(painter, cameraPlane);
    }
 }

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp

@@ -55 +55 @@
 
   void initialize(QGLView *view, QGLPainter *painter) const;
-  void draw(QGLPainter *painter) const;
+  void draw(QGLPainter *painter, const QVector4D &cameraPlane) const;
 
   enum SelectionModeType{
@@ -100 +100 @@
   MoleculeNodeMap MoleculesinSceneMap;
 
-  QGLSceneNode *meshEmpty;
-  QGLSceneNode *meshSphereHi;
-  QGLSceneNode *meshSphereLo;
-  QGLSceneNode *meshCylinderHi;
-  QGLSceneNode *meshCylinderLo;
+  QGLSceneNode *meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
+  QGLSceneNode *meshSphere[GLMoleculeObject::DETAILTYPES_MAX];
+  QGLSceneNode *meshCylinder[GLMoleculeObject::DETAILTYPES_MAX];
 
   SelectionModeType selectionMode;

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

@@ -369 +369 @@
     changesPresent = false;
   }
-  worldscene->draw(painter);
+
+  QVector3D cameraDir = camera()->center() - camera()->eye();
+  cameraDir.normalize();
+  QVector4D cameraPlane(cameraDir, QVector3D::dotProduct(cameraDir, camera()->eye()));
+  worldscene->draw(painter, cameraPlane);
 
   drawDreiBein(painter);