Changeset 02b2d3 for src/UIElements/Views

Timestamp:

Jul 17, 2012, 12:17:24 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:

0a6ff9

Parents:

26ed25

git-author:

Michael Ankele <ankele@…> (05/08/12 13:11:41)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:24)

Message:

GL: prettier domain box

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (11 diffs)

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

@@ -28 +28 @@
 #include <Qt3D/qglsphere.h>
 #include <Qt3D/qglcylinder.h>
+#include <Qt3D/qglcube.h>
 
 #include "GLWorldScene.hpp"
@@ -52 +53 @@
   createDreiBein();
   //changeMaterials(false);
-  domainBoxMaterial = new QGLMaterial;
-  domainBoxMaterial->setAmbientColor(QColor(0,0,0,255));
-  domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
-  domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
 
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
@@ -116 +113 @@
 void GLWorldView::createDomainBox()
 {
-
+  domainBoxMaterial = new QGLMaterial;
+  domainBoxMaterial->setAmbientColor(QColor(0,0,0,255));
+  domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
+  domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
+
+
+  QGLMaterial *material = new QGLMaterial;
+  material->setAmbientColor(QColor(50,60,100,255));
+  material->setDiffuseColor(QColor(150,160,200,180));
+
+  QGLBuilder builder;
+  builder << QGL::Faceted;
+  builder << QGLCube(-1.0); // "inverted" => inside faces are used as front.
+  meshDomainBox = builder.finalizedSceneNode();
+  QMatrix4x4 mat;
+  mat.translate(0.5f, 0.5f, 0.5f);
+  meshDomainBox->setLocalTransform(mat);
+  meshDomainBox->setMaterial(material);
 }
 
 void GLWorldView::createDreiBein()
 {
+  // Create 3 color for the 3 axes.
   dreiBeinMaterial[0] = new QGLMaterial;
   dreiBeinMaterial[0]->setColor(QColor(255,50,50,255));
@@ -128 +143 @@
   dreiBeinMaterial[2]->setColor(QColor(50,50,255,255));
 
+  // Create the basic meshes (cylinder and cone).
   QGLBuilder builderCyl;
   builderCyl << QGLCylinder(.15,.15,1.0,16);
@@ -141 +157 @@
   }
 
+  // Create a scene node from the 3 axes.
   meshDreiBein = new QGLSceneNode(this);
 
@@ -285 +302 @@
 void GLWorldView::paintGL(QGLPainter *painter)
 {
-  drawDomainBox(painter);
-
   if (changesPresent) {
     initializeGL(painter);
@@ -294 +309 @@
 
   drawDreiBein(painter);
+
+  // Domain box has to be last because of its transparency.
+  drawDomainBox(painter);
 }
 
@@ -418 +436 @@
 }
 
+/**
+ * Draw a transparent cube representing the domain.
+ */
 void GLWorldView::drawDomainBox(QGLPainter *painter) const
 {
+  // Apply the domain matrix.
   RealSpaceMatrix m = World::getInstance().getDomain().getM();
   painter->modelViewMatrix().push();
@@ -427 +449 @@
                                            0.0,       0.0,       0.0,       1.0);
 
+  // Draw the transparent cube.
+  glCullFace(GL_BACK);
+  glEnable(GL_CULL_FACE);
+  glEnable(GL_BLEND);
+  glDepthMask(0);
+  //glDisable(GL_DEPTH_TEST);
+  meshDomainBox->draw(painter);
+  //glEnable(GL_DEPTH_TEST);
+  glDepthMask(1);
+  glDisable(GL_BLEND);
+  glDisable(GL_CULL_FACE);
+
+  // Draw the outlines.
   painter->setFaceMaterial(QGL::AllFaces, domainBoxMaterial);
   //glEnable(GL_LINE_SMOOTH);
@@ -447 +482 @@
   painter->setVertexAttribute(QGL::Position, array);
   painter->draw(QGL::Lines, 24);
+
   painter->modelViewMatrix().pop();
 }
@@ -454 +490 @@
   painter->modelViewMatrix().push();
   painter->modelViewMatrix().translate(camera()->center());
-  painter->setFaceMaterial(QGL::AllFaces, NULL);
+  painter->setFaceMaterial(QGL::FrontFaces, NULL);
   meshDreiBein->draw(painter);
   painter->modelViewMatrix().pop();