Changeset 3b229e for src

Timestamp:

Apr 6, 2012, 11:57:23 AM (13 years ago)

Author:

Frederik Heber <heber@…>

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:

225cf5

Parents:

c67518

git-author:

Michael Ankele <ankele@…> (04/02/12 10:48:10)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:23)

Message:

GL: made hover/selection materials static

• no more getMaterial(_evil_number_) workaround

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (8 diffs)
• GLMoleculeObject.hpp (modified) (3 diffs)
• GLMoleculeObject_atom.cpp (modified) (1 diff)
• GLMoleculeObject_molecule.cpp (modified) (1 diff)

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

@@ -41 +41 @@
 
 #include "CodePatterns/MemDebug.hpp"
+
+QGLMaterial *GLMoleculeObject::m_hoverMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_selectionMaterial = NULL;
+QGLMaterial *GLMoleculeObject::m_selectionBoxMaterial = NULL;
 
 
@@ -55 +59 @@
    m_selected = false;
    m_material = 0;
-   m_hoverMaterial = 0;
-   m_selectionMaterial = 0;
+   initStaticMaterials();
 }
 
@@ -72 +75 @@
    m_selected = false;
    m_material = 0;
-   m_hoverMaterial = 0;
-   m_selectionMaterial = 0;
+   initStaticMaterials();
 }
 
@@ -107 +109 @@
    else
        material = m_material;
+
+   ASSERT(material, "GLMoleculeObject::draw: chosen material is NULL");
+
    painter->setColor(material->diffuseColor());
    painter->setFaceMaterial(QGL::AllFaces, material);
@@ -123 +128 @@
 
    if (m_selected){
+     painter->setFaceMaterial(QGL::AllFaces, m_selectionBoxMaterial);
      QVector3DArray array;
      qreal radius = 0.3f;
@@ -190 +196 @@
 QGLMaterial* GLMoleculeObject::getMaterial(size_t no)
 {
-  ASSERT( (no >= 0) && (no < MAX_ELEMENTS) || (no == 65536),
+  ASSERT( (no > 0) && (no < MAX_ELEMENTS),
       "GLMoleculeView::getMaterial() - Element no "+toString(no)+" is invalid.");
   if (ElementNoMaterialMap.find(no) != ElementNoMaterialMap.end()){
@@ -200 +206 @@
     QGLMaterial *newmaterial = new QGLMaterial(NULL);
 
-    if (no == 0) { // create hover material
-      newmaterial->setAmbientColor( QColor(0, 128, 128) );
-    } else if (no == 65536) { // create selection material
-      newmaterial->setAmbientColor( QColor(255, 50, 50) );
-    } else { // create material for element
-      periodentafel *periode = World::getInstance().getPeriode();
-      const element *desiredelement = periode->FindElement(no);
-      ASSERT(desiredelement != NULL,
-          "GLMoleculeView::getMaterial() - desired element "+toString(no)+" not present in periodentafel.");
-      const unsigned char* color = desiredelement->getColor();
-      LOG(1, "Creating new material with color " << (int)color[0] << "," << (int)color[1] << "," << (int)color[2] << ".");
-      newmaterial->setAmbientColor( QColor((int)color[0], (int)color[1], (int)color[2]) );
-    }
+    // create material for element
+    periodentafel *periode = World::getInstance().getPeriode();
+    const element *desiredelement = periode->FindElement(no);
+    ASSERT(desiredelement != NULL,
+        "GLMoleculeView::getMaterial() - desired element "+toString(no)+" not present in periodentafel.");
+    const unsigned char* color = desiredelement->getColor();
+    LOG(1, "Creating new material with color " << (int)color[0] << "," << (int)color[1] << "," << (int)color[2] << ".");
+    newmaterial->setAmbientColor( QColor((int)color[0], (int)color[1], (int)color[2]) );
     newmaterial->setSpecularColor( QColor(60, 60, 60) );
     newmaterial->setShininess( 128 );
@@ -218 +219 @@
 
     return newmaterial;
+  }
+}
+
+/** Create the 3 materials shared by all objects.
+ *
+ */
+void GLMoleculeObject::initStaticMaterials()
+{
+  if (!m_hoverMaterial){
+    m_hoverMaterial = new QGLMaterial(NULL);
+    m_hoverMaterial->setAmbientColor( QColor(0, 128, 128) );
+    m_hoverMaterial->setSpecularColor( QColor(60, 60, 60) );
+    m_hoverMaterial->setShininess( 128 );
+  }
+  if (!m_selectionMaterial){
+    m_selectionMaterial = new QGLMaterial(NULL);
+    m_selectionMaterial->setAmbientColor( QColor(255, 50, 50) );
+    m_selectionMaterial->setSpecularColor( QColor(60, 60, 60) );
+    m_selectionMaterial->setShininess( 128 );
+  }
+  if (!m_selectionBoxMaterial){
+    m_selectionBoxMaterial = new QGLMaterial(NULL);
+    m_selectionBoxMaterial->setAmbientColor( QColor(0, 0, 0) );
+    m_selectionBoxMaterial->setDiffuseColor( QColor(0, 0, 0) );
+    m_selectionBoxMaterial->setEmittedLight( QColor(155, 50, 50) );
   }
 }

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

@@ -57 +57 @@
 
    QGLMaterial *material() const { return m_material; }
-   void setMaterial(QGLMaterial *value)
-       { m_material = value; m_hoverMaterial = value; }
-
-   QGLMaterial *hoverMaterial() const { return m_hoverMaterial; }
-   void setHoverMaterial(QGLMaterial *value) { m_hoverMaterial = value; }
-
-   QGLMaterial *selectionMaterial() const { return m_selectionMaterial; }
-   void setSelectionMaterial(QGLMaterial *value) { m_selectionMaterial = value; }
+   void setMaterial(QGLMaterial *value) { m_material = value; }
 
    QGLAbstractEffect *effect() const { return m_effect; }
@@ -75 +68 @@
    void setSelected(bool value);
 
+   void initStaticMaterials();
    void initialize(QGLView *view, QGLPainter *painter);
    void draw(QGLPainter *painter);
@@ -106 +100 @@
    QVector3D m_rotationVector;
    QGLMaterial *m_material;
-   QGLMaterial *m_hoverMaterial;
-   QGLMaterial *m_selectionMaterial;
+   static QGLMaterial *m_hoverMaterial;
+   static QGLMaterial *m_selectionMaterial;
+   static QGLMaterial *m_selectionBoxMaterial;
    QGLAbstractEffect *m_effect;
    int m_objectId;

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

@@ -106 +106 @@
       "GLMoleculeObject_atom::GLMoleculeObject_atom() - QGLMaterial ref from getter function is NULL.");
   setMaterial(elementmaterial);
-  QGLMaterial *hovermaterial = getMaterial(0); // 0 is the hover material
-  ASSERT(hovermaterial != NULL,
-      "GLMoleculeObject_atom::GLMoleculeObject_atom() - QGLMaterial ref from getter function for hover is NULL.");
-  setHoverMaterial(hovermaterial);
-  QGLMaterial *selectionmaterial = getMaterial(65536); // 65536 is the selection material
-  ASSERT(selectionmaterial != NULL,
-      "GLMoleculeObject_atom::GLMoleculeObject_atom() - QGLMaterial ref from getter function for selection is NULL.");
-  setSelectionMaterial(selectionmaterial);
 
   // set scale

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

@@ -63 +63 @@
   setPosition(QVector3D(0,0,0));
   setScale(5.0f);
-  QGLMaterial *selectionmaterial = getMaterial(65536); // 65536 is the selection material
-  setMaterial(selectionmaterial);
-  setSelectionMaterial(selectionmaterial);
+  setMaterial(getMaterial(1));
 }