Skip to content
Snippets Groups Projects
Commit 8a1ccd43 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent fab1f9df
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Geo/GEntity.h
+ 6
− 9
View file @ 8a1ccd43
...@@ -22,10 +22,10 @@ class GEntity { ...@@ -22,10 +22,10 @@ class GEntity {
private: private:
GModel *_model; GModel *_model;
MRep *_mrep;
int _tag; int _tag;
MRep *_geom, *_mesh;
char _visible, _flag; char _visible, _flag;
public: public:
// All known entity types // All known entity types
...@@ -43,11 +43,13 @@ class GEntity { ...@@ -43,11 +43,13 @@ class GEntity {
Sphere, Sphere,
Cone, Cone,
Torus, Torus,
RuledSurface,
ParametricSurface, ParametricSurface,
DiscreteSurface, DiscreteSurface,
Volume Volume
}; };
// Returns a string describing the entity type
virtual std::string getTypeString() virtual std::string getTypeString()
{ {
char *name[] = { char *name[] = {
...@@ -64,6 +66,7 @@ class GEntity { ...@@ -64,6 +66,7 @@ class GEntity {
"Sphere", "Sphere",
"Cone", "Cone",
"Torus", "Torus",
"Ruled surface",
"Parametric surface", "Parametric surface",
"Discrete surface", "Discrete surface",
"Volume" "Volume"
...@@ -75,7 +78,7 @@ class GEntity { ...@@ -75,7 +78,7 @@ class GEntity {
return name[type]; return name[type];
} }
GEntity(GModel *m, int t) : _model(m), _tag(t), _visible(true), _flag(0) {} GEntity(GModel *m, int t) : _model(m), _mrep(0), _tag(t), _visible(true), _flag(0) {}
virtual ~GEntity() {}; virtual ~GEntity() {};
...@@ -138,12 +141,6 @@ class GEntity { ...@@ -138,12 +141,6 @@ class GEntity {
virtual char getFlag(){ return _flag; } virtual char getFlag(){ return _flag; }
virtual void setFlag(char val){ _flag = val; } virtual void setFlag(char val){ _flag = val; }
// Returns a renderable representation of the geometry
virtual MRep *geomRep(){ return _geom; }
// Returns a renderable representation of the mesh
virtual MRep *meshRep(){ return _mesh; }
// Returns an information string for the entity // Returns an information string for the entity
virtual std::string getInfoString(); virtual std::string getInfoString();
......
Geo/SVector3.cpp
+ 3
− 1
View file @ 8a1ccd43
...@@ -42,7 +42,9 @@ double norm(const SVector3 &v) ...@@ -42,7 +42,9 @@ double norm(const SVector3 &v)
double SVector3::normalize() double SVector3::normalize()
{ {
double n = norm(*this); double n = norm(*this);
P[0] /= n; P[1]/= n; P[2] /= n; if(n){
P[0] /= n; P[1]/= n; P[2] /= n;
}
return n; return n;
} }
......
Geo/gmshFace.cpp
+ 2
− 0
View file @ 8a1ccd43
...@@ -195,6 +195,8 @@ GEntity::GeomType gmshFace::geomType() const ...@@ -195,6 +195,8 @@ GEntity::GeomType gmshFace::geomType() const
switch(s->Typ){ switch(s->Typ){
case MSH_SURF_NURBS: return Nurb; case MSH_SURF_NURBS: return Nurb;
case MSH_SURF_PLAN: return Plane; case MSH_SURF_PLAN: return Plane;
case MSH_SURF_REGL:
case MSH_SURF_TRIC: return RuledSurface;
case MSH_SURF_DISCRETE: return DiscreteSurface; case MSH_SURF_DISCRETE: return DiscreteSurface;
default: return Unknown; default: return Unknown;
} }
......
Graphics/Geom.cpp
+ 31
− 33
View file @ 8a1ccd43
// $Id: Geom.cpp,v 1.109 2006-08-13 06:59:14 geuzaine Exp $ // $Id: Geom.cpp,v 1.110 2006-08-13 18:11:17 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -150,7 +150,8 @@ public : ...@@ -150,7 +150,8 @@ public :
GPoint p = e->point(0.5 * (t_max - t_min)); GPoint p = e->point(0.5 * (t_max - t_min));
char Num[100]; char Num[100];
sprintf(Num, "%d", e->tag()); sprintf(Num, "%d", e->tag());
double offset = (0.5 * CTX.geom.line_width + 0.3 * CTX.gl_fontsize) * CTX.pixel_equiv_x; double offset = (0.5 * CTX.geom.line_width + 0.3 * CTX.gl_fontsize) *
CTX.pixel_equiv_x;
glRasterPos3d(p.x() + offset / CTX.s[0], glRasterPos3d(p.x() + offset / CTX.s[0],
p.y() + offset / CTX.s[1], p.y() + offset / CTX.s[1],
p.z() + offset / CTX.s[2]); p.z() + offset / CTX.s[2]);
...@@ -160,10 +161,10 @@ public : ...@@ -160,10 +161,10 @@ public :
if(CTX.geom.tangents) { if(CTX.geom.tangents) {
double t = 0.5 * (t_max - t_min); double t = 0.5 * (t_max - t_min);
GPoint p = e->point(t); GPoint p = e->point(t);
SVector3 der = e->firstDer(t) ; SVector3 der = e->firstDer(t);
double mod = sqrt(der[0] * der[0] + der[1] * der[1] + der[2] * der[2]); der.normalize();
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
der[i] = der[i] / mod * CTX.geom.tangents * CTX.pixel_equiv_x / CTX.s[i]; der[i] *= CTX.geom.tangents * CTX.pixel_equiv_x / CTX.s[i];
glColor4ubv((GLubyte *) & CTX.color.geom.tangents); glColor4ubv((GLubyte *) & CTX.color.geom.tangents);
Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius, Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius,
CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius, CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius,
...@@ -189,14 +190,14 @@ private: ...@@ -189,14 +190,14 @@ private:
int N = 20; int N = 20;
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
for(int i = 0; i < N; i++) { for(int i = 0; i < N; i++) {
GPoint coords = f->point((double)i / (double)(N - 1), 0.5); GPoint p = f->point((double)i / (double)(N - 1), 0.5);
glVertex3d(coords.x(), coords.y(), coords.z()); glVertex3d(p.x(), p.y(), p.z());
} }
glEnd(); glEnd();
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
for(int i = 0; i < N; i++) { for(int i = 0; i < N; i++) {
GPoint coords = f->point(0.5, (double)i / (double)(N - 1)); GPoint p = f->point(0.5, (double)i / (double)(N - 1));
glVertex3d(coords.x(), coords.y(), coords.z()); glVertex3d(p.x(), p.y(), p.z());
} }
glEnd(); glEnd();
glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_STIPPLE);
...@@ -204,23 +205,21 @@ private: ...@@ -204,23 +205,21 @@ private:
} }
if(CTX.geom.surfaces_num) { if(CTX.geom.surfaces_num) {
GPoint coords = f->point(0.5, 0.5); GPoint p = f->point(0.5, 0.5);
char Num[100]; char Num[100];
sprintf(Num, "%d", f->tag()); sprintf(Num, "%d", f->tag());
double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x; double offset = 0.3 * CTX.gl_fontsize * CTX.pixel_equiv_x;
glRasterPos3d(coords.x() + offset / CTX.s[0], glRasterPos3d(p.x() + offset / CTX.s[0],
coords.y() + offset / CTX.s[1], p.y() + offset / CTX.s[1],
coords.z() + offset / CTX.s[2]); p.z() + offset / CTX.s[2]);
Draw_String(Num); Draw_String(Num);
} }
if(CTX.geom.normals) { if(CTX.geom.normals) {
SPoint2 p2 = SPoint2(0.5, 0.5); GPoint p = f->point(0.5, 0.5);
SVector3 nn = f->normal(p2); SVector3 n = f->normal(SPoint2(0.5, 0.5));
GPoint p = f->point(p2); for(int i = 0; i < 3; i++)
double n[3] = {nn.x() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[0], n[i] *= CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[i];
nn.y() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[1],
nn.z() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[2]};
glColor4ubv((GLubyte *) & CTX.color.geom.normals); glColor4ubv((GLubyte *) & CTX.color.geom.normals);
Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius, Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius,
CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius, CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius,
...@@ -258,19 +257,19 @@ private: ...@@ -258,19 +257,19 @@ private:
for(int i = 0; i < N; i++) { for(int i = 0; i < N; i++) {
double t = (double)i / (double)(N - 1); double t = (double)i / (double)(N - 1);
double x, y, z; double x, y, z;
if(dir){ if(!dir){
x = t * 0.5 * (v0.x() + v1.x()) + (1. - t) * 0.5 * (v2.x() + v3.x()); x = 0.5 * (t * (v0.x() + v1.x()) + (1. - t) * (v2.x() + v3.x()));
y = t * 0.5 * (v0.y() + v1.y()) + (1. - t) * 0.5 * (v2.y() + v3.y()); y = 0.5 * (t * (v0.y() + v1.y()) + (1. - t) * (v2.y() + v3.y()));
z = t * 0.5 * (v0.z() + v1.z()) + (1. - t) * 0.5 * (v2.z() + v3.z()); z = 0.5 * (t * (v0.z() + v1.z()) + (1. - t) * (v2.z() + v3.z()));
} }
else{ else{
x = t * 0.5 * (v0.x() + v3.x()) + (1. - t) * 0.5 * (v2.x() + v1.x()); x = 0.5 * (t * (v0.x() + v3.x()) + (1. - t) * (v2.x() + v1.x()));
y = t * 0.5 * (v0.y() + v3.y()) + (1. - t) * 0.5 * (v2.y() + v1.y()); y = 0.5 * (t * (v0.y() + v3.y()) + (1. - t) * (v2.y() + v1.y()));
z = t * 0.5 * (v0.z() + v3.z()) + (1. - t) * 0.5 * (v2.z() + v1.z()); z = 0.5 * (t * (v0.z() + v3.z()) + (1. - t) * (v2.z() + v1.z()));
} }
pt.setPosition(x, y, z); pt.setPosition(x, y, z);
if(f->containsPoint(pt)){ if(f->containsPoint(pt)){
pt_last_inside.setPosition(pt.x(), pt.y(), pt.z()); pt_last_inside.setPosition(x, y, z);
if(!end_line) { f->cross.push_back(pt); end_line = 1; } if(!end_line) { f->cross.push_back(pt); end_line = 1; }
} }
else { else {
...@@ -279,13 +278,13 @@ private: ...@@ -279,13 +278,13 @@ private:
} }
if(end_line) f->cross.push_back(pt_last_inside); if(end_line) f->cross.push_back(pt_last_inside);
} }
// if we couldn't determine a cross, add dummy point so that // if we couldn't determine a cross, add a dummy point so that
// we won't try again // we won't try again
if(!f->cross.size()) f->cross.push_back(SPoint3(0., 0., 0.)); if(!f->cross.size()) f->cross.push_back(SPoint3(0., 0., 0.));
CTX.threads_lock = 0; CTX.threads_lock = 0;
} }
if(f->cross.size() < 2) return ; if(f->cross.size() < 2) return;
if(CTX.geom.surfaces) { if(CTX.geom.surfaces) {
glEnable(GL_LINE_STIPPLE); glEnable(GL_LINE_STIPPLE);
...@@ -314,10 +313,9 @@ private: ...@@ -314,10 +313,9 @@ private:
0.5 * (f->cross[0].y() + f->cross[1].y()), 0.5 * (f->cross[0].y() + f->cross[1].y()),
0.5 * (f->cross[0].z() + f->cross[1].z())); 0.5 * (f->cross[0].z() + f->cross[1].z()));
SPoint2 uv = f->parFromPoint(p); SPoint2 uv = f->parFromPoint(p);
SVector3 nn = f->normal(uv); SVector3 n = f->normal(uv);
double n[3] = {nn.x() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[0], for(int i = 0; i < 3; i++)
nn.y() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[1], n[i] *= CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[i];
nn.z() * CTX.geom.normals * CTX.pixel_equiv_x / CTX.s[2]};
glColor4ubv((GLubyte *) & CTX.color.geom.normals); glColor4ubv((GLubyte *) & CTX.color.geom.normals);
Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius, Draw_Vector(CTX.vector_type, 0, CTX.arrow_rel_head_radius,
CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius, CTX.arrow_rel_stem_length, CTX.arrow_rel_stem_radius,
......
Graphics/Mesh.cpp
+ 20
− 18
View file @ 8a1ccd43
// $Id: Mesh.cpp,v 1.159 2006-08-12 17:44:25 geuzaine Exp $ // $Id: Mesh.cpp,v 1.160 2006-08-13 18:11:17 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -64,19 +64,21 @@ void renumberFaceVertices(GFace *f, List_T *xyz) ...@@ -64,19 +64,21 @@ void renumberFaceVertices(GFace *f, List_T *xyz)
// define this to draw the vertex array by indexing elements // define this to draw the vertex array by indexing elements
//#define ELEM //#define ELEM
class drawMeshGFace class drawMeshGFace
{ {
public : public :
void operator () (GFace *s) void operator () (GFace *f)
{ {
if(!s->getVisibility()) if(!f->getVisibility())
return; return;
if(CTX.render_mode == GMSH_SELECT) { if(CTX.render_mode == GMSH_SELECT) {
glPushName(2); glPushName(2);
glPushName(s->tag()); glPushName(f->tag());
} }
#if 0 #if 0
static int first = 1; static int first = 1;
static List_T *xyz; static List_T *xyz;
...@@ -84,9 +86,9 @@ public : ...@@ -84,9 +86,9 @@ public :
if(first){ if(first){
first = 0; first = 0;
printf("stripe surface %d\n", s->tag()); printf("stripe surface %d\n", f->tag());
xyz = List_Create(s->mesh_vertices.size(), 1000, sizeof(float)); xyz = List_Create(f->mesh_vertices.size(), 1000, sizeof(float));
renumberFaceVertices(s, xyz); renumberFaceVertices(f, xyz);
/* /*
for(int i = 0; i < List_Nbr(xyz)/3; i+=3){ for(int i = 0; i < List_Nbr(xyz)/3; i+=3){
...@@ -102,11 +104,11 @@ public : ...@@ -102,11 +104,11 @@ public :
//actcParami(tc, ACTC_OUT_MAX_PRIM_VERTS, INT_MAX); // optimum 12? //actcParami(tc, ACTC_OUT_MAX_PRIM_VERTS, INT_MAX); // optimum 12?
actcParami(tc, ACTC_OUT_MAX_PRIM_VERTS, 100); // optimum 12? actcParami(tc, ACTC_OUT_MAX_PRIM_VERTS, 100); // optimum 12?
actcBeginInput(tc); actcBeginInput(tc);
for(unsigned int i = 0; i < s->triangles.size(); i++){ for(unsigned int i = 0; i < f->triangles.size(); i++){
actcAddTriangle(tc, actcAddTriangle(tc,
s->triangles[i]->getVertex(0)->getNum(), f->triangles[i]->getVertex(0)->getNum(),
s->triangles[i]->getVertex(1)->getNum(), f->triangles[i]->getVertex(1)->getNum(),
s->triangles[i]->getVertex(2)->getNum()); f->triangles[i]->getVertex(2)->getNum());
} }
actcEndInput(tc); actcEndInput(tc);
actcBeginOutput(tc); actcBeginOutput(tc);
...@@ -168,16 +170,16 @@ public : ...@@ -168,16 +170,16 @@ public :
#endif #endif
unsigned int col; unsigned int col;
if(s->getFlag() > 0){ if(f->getFlag() > 0){
col = CTX.color.geom.surface_sel; col = CTX.color.geom.surface_sel;
} }
else if(CTX.mesh.color_carousel == 1){ else if(CTX.mesh.color_carousel == 1){
col = CTX.color.mesh.carousel[abs(s->tag() % 20)]; col = CTX.color.mesh.carousel[abs(f->tag() % 20)];
} }
else if(CTX.mesh.color_carousel == 2){ else if(CTX.mesh.color_carousel == 2){
int n = 1; int n = 1;
int np = s->physicals.size(); int np = f->physicals.size();
if(np) n = s->physicals[np - 1]; if(np) n = f->physicals[np - 1];
col = CTX.color.mesh.carousel[abs(n % 20)]; col = CTX.color.mesh.carousel[abs(n % 20)];
} }
else if(CTX.mesh.color_carousel == 3){ else if(CTX.mesh.color_carousel == 3){
...@@ -188,8 +190,8 @@ public : ...@@ -188,8 +190,8 @@ public :
glColor4ubv((GLubyte *)&col); glColor4ubv((GLubyte *)&col);
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
for(unsigned int i = 0; i < s->triangles.size(); i++){ for(unsigned int i = 0; i < f->triangles.size(); i++){
MTriangle *t = s->triangles[i]; MTriangle *t = f->triangles[i];
for(int j = 0; j < 3; j++){ for(int j = 0; j < 3; j++){
MVertex *v = t->getVertex(j); MVertex *v = t->getVertex(j);
glVertex3d(v->x(), v->y(), v->z()); glVertex3d(v->x(), v->y(), v->z());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment