Improvements in visualization.

Author: cheind

examples/deform_bar.cpp

@@ -80,7 +80,8 @@ int main(int argc, char **argv) {
  // Create an OSG viewer to visualize incremental deformation.
  float inc = 0.001;
  float t = 0.f;
- deform::example::OSGViewer viewer(argc, argv, mesh, [&](Mesh &mesh, double time) {
+ deform::example::OSGViewer viewer(mesh, anchors, handles);
+ viewer.onFrame([&](Mesh &mesh, double time) {
 
  t+= inc;
  if (t > 1.f)

examples/deform_sphere.cpp

@@ -67,7 +67,8 @@ int main(int argc, char **argv) {
  double add = 0.01;
 
  // Create an OSG viewer to visualize incremental deformation.
- deform::example::OSGViewer viewer(argc, argv, mesh, [&p, &pi, &add, &arap](Mesh &mesh, double time) {
+ deform::example::OSGViewer viewer(mesh, {37}, {32});
+ viewer.onFrame([&p, &pi, &add, &arap](Mesh &mesh, double time) {
 
  // Update motion
 

examples/osg_viewer.cpp

@@ -18,6 +18,10 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osgFX/Scribe>
 #include <osg/ShadeModel>
+#include <osg/LightModel>
+#include <osg/Material>
+
+#include <unordered_set>
 
 namespace deform {
  namespace example {
@@ -27,6 +31,7 @@ namespace deform {
  DeformCallback dc;
  osg::ref_ptr<osgViewer::Viewer> viewer;
  osg::ref_ptr<osg::Group> root;
+ osg::ref_ptr<osg::Geode> geode;
  };
 
  class OSGUpdateCallback : public osg::NodeCallback
@@ -71,48 +76,51 @@ namespace deform {
  OSGViewer::DeformCallback *_dc;
  };
 
- OSGViewer::OSGViewer(int argc, char **argv, OSGViewer::Mesh &mesh, DeformCallback dc)
- : _data(new data())
+ OSGViewer::OSGViewer(OSGViewer::Mesh &mesh)
+ : OSGViewer(mesh, std::vector<int>(), std::vector<int>())
+ {
+ }
+ 
+ OSGViewer::OSGViewer(Mesh &mesh, const std::vector<int> &anchors, const std::vector<int> &handles)
+ :_data(new data())
  {
  _data->mesh = &mesh;
  _data->mesh->request_face_normals();
  _data->mesh->request_vertex_normals();
  _data->mesh->update_normals();
- _data->dc = dc;
 
- setupScene();
+ setupScene(anchors, handles);
 
- osg::ArgumentParser arguments(&argc, argv);
- _data->viewer = new osgViewer::Viewer(arguments);
+ _data->viewer = new osgViewer::Viewer();
+ osg::DisplaySettings::instance()->setNumMultiSamples( 4 );
  _data->viewer->setUpViewInWindow(100, 100, 640, 360);
- //osg::DisplaySettings::instance()->setNumMultiSamples(8);
  _data->viewer->setSceneData(_data->root);
  _data->viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
  _data->viewer->getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
+ _data->viewer->getCamera()->setClearColor(osg::Vec4(1,1,1,1));
 
  _data->viewer->realize();
-
+ 
  typedef osgViewer::Viewer::Windows Windows;
  Windows windows;
  _data->viewer->getWindows(windows);
  for (auto w : windows) {
  w->setWindowName("Mesh-Deform https://github.com/cheind/mesh-deform");
  }
 
-
  _data->viewer->addEventHandler(new osgViewer::StatsHandler) ;
- 
  }
 
  OSGViewer::~OSGViewer() {
  _data->mesh->release_face_normals();
  _data->mesh->release_vertex_normals();
  }
+ 
 
- void OSGViewer::setupScene() {
+ void OSGViewer::setupScene(const std::vector<int> &anchors, const std::vector<int> &handles) {
  _data->root = new osg::Group();
 
- osg::ref_ptr<osg::Geode> geode = new osg::Geode();
+ _data->geode = new osg::Geode();
  osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
  osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
  osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array();
@@ -125,42 +133,95 @@ namespace deform {
  normals->push_back(osg::Vec3(n[0], n[1], n[2]));
  }
 
- osg::ref_ptr<osg::DrawElementsUInt> faces = new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES, 0);
+ 
+ osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
+ colors->push_back(osg::Vec4(0.9, 0.9, 0.9, 1));
+ colors->push_back(osg::Vec4(1.0, 0.0, 0.0, 1));
+ colors->push_back(osg::Vec4(0.0, 1.0, 0.0, 1));
+ 
+ osg::ref_ptr<osg::DrawElementsUInt> faces[3] = {
+ new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES, 0),
+ new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES, 0),
+ new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLES, 0)
+ };
+ 
+ std::unordered_set<int> a_ids(anchors.begin(), anchors.end());
+ std::unordered_set<int> h_ids(handles.begin(), handles.end());
+ 
+ auto aend = a_ids.end();
+ auto hend = h_ids.end();
+ 
  for (auto f = _data->mesh->faces_begin(); f != _data->mesh->faces_end(); ++f) {
  auto v = _data->mesh->fv_ccwbegin(*f);
 
- faces->push_back(v->idx()); ++v;
- faces->push_back(v->idx()); ++v;
- faces->push_back(v->idx());
+ int id0 = v->idx(); ++v;
+ int id1 = v->idx(); ++v;
+ int id2 = v->idx();
+ 
+ // Classify face
+ bool isAnchor = a_ids.find(id0) != aend || a_ids.find(id1) != aend || a_ids.find(id2) != aend;
+ bool isHandle = h_ids.find(id0) != hend || h_ids.find(id1) != hend || h_ids.find(id2) != hend;
 
- Mesh::Point p = _data->mesh->normal(*f);
- normals->push_back(osg::Vec3(p[0], p[1], p[2]));
+ if (isAnchor) {
+ faces[1]->push_back(id0);
+ faces[1]->push_back(id1);
+ faces[1]->push_back(id2);
+ } else if (isHandle) {
+ faces[2]->push_back(id0);
+ faces[2]->push_back(id1);
+ faces[2]->push_back(id2);
+ } else {
+ faces[0]->push_back(id0);
+ faces[0]->push_back(id1);
+ faces[0]->push_back(id2);
+ }
  }
 
  geometry->setVertexArray(vertices);
  geometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
- geometry->addPrimitiveSet(faces);
+ geometry->addPrimitiveSet(faces[0]);
+ geometry->addPrimitiveSet(faces[1]);
+ geometry->addPrimitiveSet(faces[2]);
  geometry->setUseVertexBufferObjects(true);
  geometry->setUseDisplayList(false);
+ geometry->setColorArray(colors);
+ geometry->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE_SET);
 
- geode->addDrawable(geometry);
- geode->setDataVariance(osg::Object::DYNAMIC);
- geode->setUpdateCallback(new OSGUpdateCallback(_data->mesh, &_data->dc));
+ _data->geode->addDrawable(geometry);
+ _data->geode->setDataVariance(osg::Object::DYNAMIC);
 
- osg::StateSet* state = geode->getOrCreateStateSet();
- osg::ShadeModel* sm = new osg::ShadeModel();
+ osg::StateSet* state = _data->geode->getOrCreateStateSet();
+ osg::ref_ptr<osg::ShadeModel> sm = new osg::ShadeModel();
  sm->setMode(osg::ShadeModel::SMOOTH);
  state->setAttributeAndModes(sm, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
- geode->setStateSet(state);
+ 
+ osg::ref_ptr<osg::LightModel> lm = new osg::LightModel();
+ lm->setTwoSided(true);
+ state->setAttributeAndModes(lm, osg::StateAttribute::ON );
+ 
+ osg::ref_ptr<osg::Material> mat = new osg::Material;
+ mat->setColorMode(osg::Material::ColorMode::DIFFUSE);
+ mat->setSpecular(osg::Material::FRONT, osg::Vec4f(0.8f, 0.8f, 0.8f, 1.0f));
+ mat->setShininess(osg::Material::FRONT, 6.0f);
+ state->setAttributeAndModes(mat, osg::StateAttribute::ON );
+ 
+ state->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
+ 
+ _data->geode->setStateSet(state);
 
  osg::ref_ptr<osgFX::Scribe> scribe = new osgFX::Scribe();
- scribe->setWireframeColor(osg::Vec4d(0,0,0,1));
- scribe->setWireframeLineWidth(1.f);
- scribe->addChild(geode);
+ scribe->setWireframeColor(osg::Vec4d(0.2,0.2,0.2,1));
+ scribe->setWireframeLineWidth(0.5f);
+ scribe->addChild(_data->geode);
 
  _data->root->addChild(scribe);
  }
 
+ void OSGViewer::onFrame(DeformCallback dc) {
+ _data->dc = dc;
+ _data->geode->setUpdateCallback(new OSGUpdateCallback(_data->mesh, &_data->dc));
+ }
+ 
  void OSGViewer::run() {
  _data->viewer->run();
  }

examples/osg_viewer.h

@@ -24,16 +24,19 @@ namespace deform {
 
  typedef std::function<bool(Mesh&, double)> DeformCallback;
 
- OSGViewer(int argc, char **argv, Mesh &mesh, DeformCallback dc);
+ OSGViewer(Mesh &mesh);
+ OSGViewer(Mesh &mesh, const std::vector<int> &anchors, const std::vector<int> &handles);
  OSGViewer(const OSGViewer &other) = delete;
  OSGViewer &operator=(const OSGViewer &other) = delete;
  ~OSGViewer();
 
+ void onFrame(DeformCallback dc);
+ 
  void run();
 
  private:
 
- void setupScene();
+ void setupScene(const std::vector<int> &anchors, const std::vector<int> &handles);
 
  struct data;
  std::unique_ptr<data> _data;