diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2011-04-05 19:02:15 +0000 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2011-04-05 19:02:15 +0000 |
| commit | 1e31b082d1a1aa710aa3a7432f451a24e1a38e16 (patch) | |
| tree | 811a1364a6359c567ca88edf79a64b6d18d86520 /src/gui | |
| parent | 5e4537347bd24712211261e412bc9bfd684c60e7 (diff) | |
| download | vhc-1e31b082d1a1aa710aa3a7432f451a24e1a38e16.tar.gz vhc-1e31b082d1a1aa710aa3a7432f451a24e1a38e16.tar.bz2 vhc-1e31b082d1a1aa710aa3a7432f451a24e1a38e16.zip | |
foo
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/ElementRenderer.cc | 3 | ||||
| -rw-r--r-- | src/gui/GLWidget.cc | 3 | ||||
| -rw-r--r-- | src/gui/Makefile | 2 | ||||
| -rw-r--r-- | src/gui/moc_GLWidget.cpp | 2 | ||||
| -rw-r--r-- | src/gui/util.cc | 5 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/ElementRenderer.cc b/src/gui/ElementRenderer.cc index afce65c..3dc22b1 100644 --- a/src/gui/ElementRenderer.cc +++ b/src/gui/ElementRenderer.cc @@ -56,9 +56,10 @@ void ElementRenderer::visit(Dipole* dipole) { double angle = asin(axis.norm() / d.norm()); glRotated(angle * 180 / M_PI, axis.getX(), axis.getY(), axis.getZ()); + //double fraction util::torus(d.norm(), dipole->getSectionRadius(), - dipole->getAngle() / (2 * M_PI),12, 200); + dipole->getAngle() / (2 * M_PI), SLICES, 200);// * dipole->getAngle() * d.norm()); glPopMatrix(); } diff --git a/src/gui/GLWidget.cc b/src/gui/GLWidget.cc index b169c97..720dd9e 100644 --- a/src/gui/GLWidget.cc +++ b/src/gui/GLWidget.cc @@ -90,10 +90,12 @@ void GLWidget::paintGL () { //glTranslated (0.0, 0.0, -10.0); //glColor3d (0.0, 0.0, 1.0); camera.setView(); + axes(); glScaled (300.0, 300.0, 300.0); + if (wireframe) { glPolygonMode(GL_FRONT, GL_LINE); glPolygonMode(GL_BACK, GL_LINE); @@ -107,6 +109,7 @@ void GLWidget::paintGL () { vhc::StraightElement* se = new vhc::StraightElement(vhc::Vector3D::j, vhc::Vector3D::j + vhc::Vector3D::i, 0.2); vhc::StraightElement* se2 = new vhc::StraightElement(vhc::Vector3D(2,0,0), vhc::Vector3D(2,-1,0), 0.2); se->accept(*er); + //se.draw() se2->accept(*er); delete se; se = NULL; delete se2; se2 = NULL; diff --git a/src/gui/Makefile b/src/gui/Makefile index 6e33fef..3108ca7 100644 --- a/src/gui/Makefile +++ b/src/gui/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: $(BINDIR)/gui/gui -# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Apr 5 00:12:18 2011 +# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Apr 5 21:00:50 2011 # Project: gui.pro # Template: app # Command: /usr/bin/qmake -o Makefile gui.pro diff --git a/src/gui/moc_GLWidget.cpp b/src/gui/moc_GLWidget.cpp index 17b611d..0e6bd03 100644 --- a/src/gui/moc_GLWidget.cpp +++ b/src/gui/moc_GLWidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'GLWidget.h' ** -** Created: Mon Apr 4 23:55:10 2011 +** Created: Tue Apr 5 13:32:33 2011 ** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) ** ** WARNING! All changes made in this file will be lost! diff --git a/src/gui/util.cc b/src/gui/util.cc index 155df32..aaf7a63 100644 --- a/src/gui/util.cc +++ b/src/gui/util.cc @@ -18,13 +18,14 @@ void torus(double R, double r, double fraction, int slices, int stacks) { glBegin(GL_QUAD_STRIP); for (j = 0; j <= stacks * fraction ; j++) { for (k = 1; k >= 0; k--) { - s = (i + k) % slices + 0.5; + s = (i + k) % slices;// + 0.5; t = j % stacks; x = (R+r*cos(s*twopi/slices))*cos(t*twopi/stacks); y = (R+r*cos(s*twopi/slices))*sin(t*twopi/stacks); z = r * sin(s * twopi / slices); - glVertex3f(x, y, z); + glColor3d((rand() % 100) / 100.0, (rand() % 100) / 100.0, (rand() % 100) / 100.0); + glVertex3d(x, y, z); } } glEnd(); |