Author: cosurgi
Date: 2008-10-11 16:23:53 +0200 (Sat, 11 Oct 2008)
New Revision: 1542
Added:
trunk/gui/qt3/pictures/XYZ.png
trunk/gui/qt3/pictures/YZX.png
trunk/gui/qt3/pictures/ZXY.png
Modified:
trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp
trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
Log:
Fixed OpenGL problems with displaying spheres, which
- never occurred on my desktop
- I've seen them sometimes on other peoples computers, but never could
reproduce them
- but finally have appeared on my laptop.
Everyone: those static variables in GL*Sphere* classes have to be static, don't
change that.
Vaclav - go ahead and uncomment back your code in there. I just commented it,
because I wasn't sure what was causing the bug. After it's fixed I'm sure it
wasn't your code, but some odd harware, graphics card stuff.
Small fixes in InteractingMyTetrahedron (btw, who broke that? it was working,
perhaps I should browse SVN history to find out ;)
Added: trunk/gui/qt3/pictures/XYZ.png
===================================================================
(Binary files differ)
Property changes on: trunk/gui/qt3/pictures/XYZ.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/gui/qt3/pictures/YZX.png
===================================================================
(Binary files differ)
Property changes on: trunk/gui/qt3/pictures/YZX.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/gui/qt3/pictures/ZXY.png
===================================================================
(Binary files differ)
Property changes on: trunk/gui/qt3/pictures/ZXY.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
2008-10-11 13:28:17 UTC (rev 1541)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -21,16 +21,23 @@
// glPopMatrix();
//}
+int GLDrawSphere::glSphereList=-1;
+int GLDrawSphere::glWiredSphereList=-1;
+
+vector<Vector3r> GLDrawSphere::vertices;
+vector<Vector3r> GLDrawSphere::faces;
+bool GLDrawSphere::first = true;
+
bool GLDrawSphere::glutUse=false;
bool GLDrawSphere::glutNormalize=true;
int GLDrawSphere::glutSlices=12;
int GLDrawSphere::glutStacks=6;
-GLDrawSphere::GLDrawSphere() : first(true), glWiredSphereList(-1),
glSphereList(-1){};
+GLDrawSphere::GLDrawSphere(){first=true;};
void GLDrawSphere::go(const shared_ptr<GeometricalModel>& gm, const
shared_ptr<PhysicalParameters>& ph,bool wire)
{
- if(glutUse){
+ /*if(glutUse){
Real r= (static_cast<Sphere*>(gm.get()))->radius;
glMaterialv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE,
Vector3f(gm->diffuseColor[0],gm->diffuseColor[1],gm->diffuseColor[2]));
glColor3v(gm->diffuseColor);
@@ -39,8 +46,9 @@
else glutSolidSphere(r,glutSlices,glutStacks);
if(glutNormalize) glPopAttrib();
return;
- }
+ }*/
+ //first = true;
if (first)
{
Real X = 0.525731112119133606;
Modified:
trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
2008-10-11 13:28:17 UTC (rev 1541)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -14,11 +14,11 @@
class GLDrawSphere : public GLDrawGeometricalModelFunctor
{
private :
- bool first;
- vector<Vector3r> vertices;
- vector<Vector3r> faces;
- int glWiredSphereList;
- int glSphereList;
+ static bool first;
+ static vector<Vector3r> vertices;
+ static vector<Vector3r> faces;
+ static int glWiredSphereList;
+ static int glSphereList;
void subdivideTriangle(Vector3r& v1,Vector3r& v2,Vector3r& v3,
int depth);
void drawSphere(int depth);
void drawCircle(bool filled);
@@ -29,6 +29,9 @@
public :
GLDrawSphere();
virtual void go(const shared_ptr<GeometricalModel>&, const
shared_ptr<PhysicalParameters>&,bool);
+/// Serialization
+ protected :
+ virtual void postProcessAttributes(bool
deserializing){if(deserializing){first=true;};};
virtual void registerAttributes(){REGISTER_ATTRIBUTE(glutUse);
REGISTER_ATTRIBUTE(glutNormalize); REGISTER_ATTRIBUTE(glutSlices);
REGISTER_ATTRIBUTE(glutStacks); }
RENDERS(Sphere);
Modified:
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
===================================================================
---
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
2008-10-11 13:28:17 UTC (rev 1541)
+++
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -17,10 +17,13 @@
vector<Vector3r> GLDrawInteractingSphere::vertices;
vector<Vector3r> GLDrawInteractingSphere::faces;
+bool GLDrawInteractingSphere::first = true;
+GLDrawInteractingSphere::GLDrawInteractingSphere(){first=true;};
+
void GLDrawInteractingSphere::go(const shared_ptr<InteractingGeometry>& cm,
const shared_ptr<PhysicalParameters>& ,bool)
{
- static bool first=true;
+ //first=true;
if (first)
{
@@ -153,3 +156,4 @@
}
YADE_PLUGIN();
+
Modified:
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp
===================================================================
---
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp
2008-10-11 13:28:17 UTC (rev 1541)
+++
trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -14,6 +14,7 @@
class GLDrawInteractingSphere : public GLDrawInteractingGeometryFunctor
{
private :
+ static bool first;
static vector<Vector3r> vertices;
static vector<Vector3r> faces;
static int glWiredSphereList;
@@ -22,7 +23,11 @@
void drawSphere(int depth);
public :
+ GLDrawInteractingSphere();
virtual void go(const shared_ptr<InteractingGeometry>&, const
shared_ptr<PhysicalParameters>&,bool);
+/// Serialization
+ protected :
+ virtual void postProcessAttributes(bool
deserializing){if(deserializing){first=true;};};
RENDERS(InteractingSphere);
REGISTER_CLASS_NAME(GLDrawInteractingSphere);
Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
2008-10-11 13:28:17 UTC (rev 1541)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -20,18 +20,18 @@
AABB* aabb = static_cast<AABB*>(bv.get());
// create a bounding volume from four spheres (
InteractingMyTetrahedron )
- Vector3r min = Vector3r(0,0,0);
+ Vector3r min = Vector3r(1,1,1)*100000;
min = componentMinVector(min,se3.orientation*myTet->c1 -
Vector3r(myTet->r1,myTet->r1,myTet->r1));
min = componentMinVector(min,se3.orientation*myTet->c2 -
Vector3r(myTet->r2,myTet->r2,myTet->r2));
min = componentMinVector(min,se3.orientation*myTet->c3 -
Vector3r(myTet->r3,myTet->r3,myTet->r3));
min = componentMinVector(min,se3.orientation*myTet->c4 -
Vector3r(myTet->r4,myTet->r4,myTet->r4));
min += se3.position;
- Vector3r max = Vector3r(0,0,0);
- max = componentMaxVector(min,se3.orientation*myTet->c1 +
Vector3r(myTet->r1,myTet->r1,myTet->r1));
- max = componentMaxVector(min,se3.orientation*myTet->c2 +
Vector3r(myTet->r2,myTet->r2,myTet->r2));
- max = componentMaxVector(min,se3.orientation*myTet->c3 +
Vector3r(myTet->r3,myTet->r3,myTet->r3));
- max = componentMaxVector(min,se3.orientation*myTet->c4 +
Vector3r(myTet->r4,myTet->r4,myTet->r4));
+ Vector3r max = Vector3r(1,1,1)*(-100000);
+ max = componentMaxVector(max,se3.orientation*myTet->c1 +
Vector3r(myTet->r1,myTet->r1,myTet->r1));
+ max = componentMaxVector(max,se3.orientation*myTet->c2 +
Vector3r(myTet->r2,myTet->r2,myTet->r2));
+ max = componentMaxVector(max,se3.orientation*myTet->c3 +
Vector3r(myTet->r3,myTet->r3,myTet->r3));
+ max = componentMaxVector(max,se3.orientation*myTet->c4 +
Vector3r(myTet->r4,myTet->r4,myTet->r4));
max += se3.position;
// AABB
Modified:
trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
===================================================================
---
trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
2008-10-11 13:28:17 UTC (rev 1541)
+++
trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
2008-10-11 14:23:53 UTC (rev 1542)
@@ -74,6 +74,7 @@
const Real size,
const Vector3r color)
{
+ glPushMatrix();
Vector3r axis;Real angle;
Quaternionr delta(q);
delta.ToAxisAngle(axis,angle);
@@ -84,6 +85,7 @@
Vector3r m(pos+ret*size);
drawArrow(pos, m ,color);
drawFlatText(m,txt);
+ glPopMatrix();
return ret;
}
@@ -94,7 +96,7 @@
const shared_ptr<Body>& b2,
bool wireFrame)
{
-// if(!i->isReal) return;
+ if(!i->isReal) return;
isReal=i->isReal;
CohesiveFrictionalContactInteraction* ph =
static_cast<CohesiveFrictionalContactInteraction*>(ih.get());
@@ -162,8 +164,8 @@
// drawArrow(middle+M2*size, middle+(M2-M1)*size ,Vector3r(1.0,0.4,0.4));
- drawArrow(middle, middle+ph->shearForce*size/4000.0
,Vector3r(isReal?1:0.4,0,isReal?1:0.4));
- drawFlatText( middle+ph->shearForce*size/4000.0 ,std::string("
Fs"));
+ drawArrow(middle, middle+ph->shearForce*size/4000000.0
,Vector3r(isReal?1:0.4,0,isReal?1:0.4));
+ drawFlatText( middle+ph->shearForce*size/4000000.0 ,std::string("
Fs"));
// draw normal
drawArrow(middle, middle+sc->normal*size*0.9
,Vector3r(0,isReal?1:0.4,0));
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
