Changeset 26ed25 for src/UIElements

Timestamp:

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

02b2d3

Parents:

bca99d

git-author:

Michael Ankele <ankele@…> (05/08/12 11:54:37)

git-committer:

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

Message:

GL: dreibein as a real mesh

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldView.cpp (modified) (5 diffs)
• GLWorldView.hpp (modified) (2 diffs)

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

@@ -24 +24 @@
 #include <QtGui/QToolBar>
 #include <Qt/qtimer.h>
+#include <Qt3D/qglbuilder.h>
+#include <Qt3D/qglscenenode.h>
+#include <Qt3D/qglsphere.h>
+#include <Qt3D/qglcylinder.h>
 
 #include "GLWorldScene.hpp"
@@ -45 +49 @@
   setCameraControlMode(Rotate);
 
+  createDomainBox();
+  createDreiBein();
   //changeMaterials(false);
   domainBoxMaterial = new QGLMaterial;
@@ -50 +56 @@
   domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
   domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
-
-  for (int i=0;i<3;i++){
-    dreiBeinMaterial[i] = new QGLMaterial;
-    dreiBeinMaterial[i]->setAmbientColor(QColor(0,0,0,255));
-    dreiBeinMaterial[i]->setDiffuseColor(QColor(0,0,0,255));
-    dreiBeinMaterial[i]->setEmittedLight(QColor(150,200,150,255));
-  }
 
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
@@ -113 +112 @@
   connect(fitAction, SIGNAL(triggered()), this, SLOT(fitCameraToDomain()));
   toolbar->addAction(fitAction);
+}
+
+void GLWorldView::createDomainBox()
+{
+
+}
+
+void GLWorldView::createDreiBein()
+{
+  dreiBeinMaterial[0] = new QGLMaterial;
+  dreiBeinMaterial[0]->setColor(QColor(255,50,50,255));
+  dreiBeinMaterial[1] = new QGLMaterial;
+  dreiBeinMaterial[1]->setColor(QColor(50,255,50,255));
+  dreiBeinMaterial[2] = new QGLMaterial;
+  dreiBeinMaterial[2]->setColor(QColor(50,50,255,255));
+
+  QGLBuilder builderCyl;
+  builderCyl << QGLCylinder(.15,.15,1.0,16);
+  QGLSceneNode *cyl = builderCyl.finalizedSceneNode();
+
+  QGLBuilder builderCone;
+  builderCone << QGLCylinder(0,.4,0.4,16);
+  QGLSceneNode *cone = builderCone.finalizedSceneNode();
+  {
+    QMatrix4x4 mat;
+    mat.translate(0.0f, 0.0f, 1.0f);
+    cone->setLocalTransform(mat);
+  }
+
+  meshDreiBein = new QGLSceneNode(this);
+
+  // X-direction
+  QGLSceneNode *node = new QGLSceneNode(meshDreiBein);
+  node->setMaterial(dreiBeinMaterial[0]);
+  node->addNode(cyl);
+  node->addNode(cone);
+  {
+    QMatrix4x4 mat;
+    mat.rotate(90, 0.0f, 1.0f, 0.0f);
+    node->setLocalTransform(mat);
+  }
+
+  // Y-direction
+  node = new QGLSceneNode(meshDreiBein);
+  node->setMaterial(dreiBeinMaterial[1]);
+  node->addNode(cyl);
+  node->addNode(cone);
+  {
+    QMatrix4x4 mat;
+    mat.rotate(-90, 1.0f, 0.0f, 0.0f);
+    node->setLocalTransform(mat);
+  }
+
+  // Z-direction
+  node = new QGLSceneNode(meshDreiBein);
+  node->setMaterial(dreiBeinMaterial[2]);
+  node->addNode(cyl);
+  node->addNode(cone);
 }
 
@@ -397 +454 @@
   painter->modelViewMatrix().push();
   painter->modelViewMatrix().translate(camera()->center());
-  painter->setFaceMaterial(QGL::AllFaces, dreiBeinMaterial[0]);
-  QVector3DArray array;
-  array.append(0, 0, 0); array.append(1, 0, 0);
-  array.append(0, 0, 0); array.append(0, 1, 0);
-  array.append(0, 0, 0); array.append(0, 0, 1);
-  painter->clearAttributes();
-  painter->setVertexAttribute(QGL::Position, array);
-  painter->draw(QGL::Lines, 6);
+  painter->setFaceMaterial(QGL::AllFaces, NULL);
+  meshDreiBein->draw(painter);
   painter->modelViewMatrix().pop();
 }

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

@@ -39 +39 @@
 
   void addToolBarActions(QToolBar *toolbar);
+  void createDomainBox();
+  void createDreiBein();
 
   // Observer functions
@@ -93 +95 @@
 
   QPointF lastMousePos;
+
+  QGLSceneNode *meshDomainBox;
+  QGLSceneNode *meshDreiBein;
 
   QGLMaterial *domainBoxMaterial;