Changeset 72a4c1 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp
- Timestamp:
- Jul 27, 2012, 2:29:50 PM (12 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp
rb7b752 r72a4c1 47 47 48 48 49 GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent) 49 double GLMoleculeObject::detailMinDistance[GLMoleculeObject::DETAILTYPES_MAX] = {0, 15, 30, 42}; 50 51 GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh[], QObject *parent) 50 52 : QObject(parent) 51 53 { 52 54 //mesh->setParent(this); 53 m_mesh = mesh; 55 for (int i=0;i<DETAILTYPES_MAX;i++) 56 m_mesh[i] = mesh[i]; 54 57 m_scale = 1.0f; 55 58 m_scaleZ = 1.0f; … … 67 70 { 68 71 scene->setParent(this); 69 m_mesh = scene->mainNode(); 72 m_mesh[0] = scene->mainNode(); 73 m_mesh[1] = scene->mainNode(); 74 m_mesh[2] = scene->mainNode(); 70 75 m_scale = 1.0f; 71 76 m_scaleZ = 1.0f; … … 118 123 } 119 124 120 void GLMoleculeObject::draw(QGLPainter *painter )125 void GLMoleculeObject::draw(QGLPainter *painter, const QVector4D &cameraPlane) 121 126 { 122 127 // Position the model at its designated position, scale, and orientation. … … 154 159 155 160 // Draw the geometry mesh. 156 m_mesh->draw(painter); 161 QVector4D pos4d(m_position, -1); 162 qreal distance = QVector4D::dotProduct(cameraPlane, pos4d); 163 164 if (distance > detailMinDistance[DETAIL_LOW]) 165 m_mesh[DETAIL_LOW]->draw(painter); 166 else if (distance > detailMinDistance[DETAIL_MEDIUM]) 167 m_mesh[DETAIL_MEDIUM]->draw(painter); 168 else if (distance > detailMinDistance[DETAIL_HIGH]) 169 m_mesh[DETAIL_HIGH]->draw(painter); 170 else if (distance > detailMinDistance[DETAIL_HIGHEST]) 171 m_mesh[DETAIL_HIGHEST]->draw(painter); 157 172 158 173 // Draw a box around the mesh, if selected.
Note:
See TracChangeset
for help on using the changeset viewer.