Changeset ee088cb in OpenModelica

Timestamp:

2023-03-27T11:28:24+02:00 (13 months ago)

Author:

anotheruserofgithub <96748782+anotheruserofgithub@…>

Children:

e757cda7

Parents:

740a8c7

git-author:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/09/23 06:52:36)

git-committer:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/27/23 11:28:24)

Message:

Support OBJ & 3DS files as CAD shapes

Location:

OMEdit/OMEditLIB/Animation

Files:

• AnimationUtil.h (modified) (1 diff)
• Visualization.cpp (modified) (11 diffs)
• Visualization.h (modified) (1 diff)

OMEdit/OMEditLIB/Animation/AnimationUtil.h

@@ -140 +140 @@
 }
 
-
 inline bool stlFileType(const std::string& typeName)
 {
   return typeName.substr(typeName.size()-3) == std::string("stl");
+}
+
+inline bool objFileType(const std::string& typeName)
+{
+  return typeName.substr(typeName.size()-3) == std::string("obj");
+}
+
+inline bool tdsFileType(const std::string& typeName)
+{
+  return typeName.substr(typeName.size()-3) == std::string("3ds");
 }
 

OMEdit/OMEditLIB/Animation/Visualization.cpp

@@ -42 +42 @@
 #include <osg/GL> // for having direct access to glClear()
 
+#include <osg/Array>
 #include <osg/Drawable>
 #include <osg/Shape>
@@ -332 +333 @@
       } else if (stlFileType(shape._fileName)) {
         shape._type = "stl";
+      } else if (objFileType(shape._fileName)) {
+        shape._type = "obj";
+      } else if (tdsFileType(shape._fileName)) {
+        shape._type = "3ds";
       }
     }
@@ -792 +797 @@
         for (ShapeObject& shape : relevantShapes) {
           // Consider OpenSceneGraph shape drawables only
-          if (shape._type.compare("dxf") == 0 || shape._type.compare("stl") == 0) {
+          if (shape._type.compare("dxf") == 0 || shape._type.compare("stl") == 0 ||
+              shape._type.compare("obj") == 0 || shape._type.compare("3ds") == 0) {
             continue;
           }
@@ -1282 +1288 @@
     transf->setName(shape._id);
 
-    if (shape._type.compare("stl") == 0)
-    { //cad node
+    if (shape._type.compare("obj") == 0 or shape._type.compare("3ds") == 0)
+    { //advanced cad node
+      //std::cout<<"It's an advanced cad and the filename is "<<shape._fileName<<std::endl;
+      osg::ref_ptr<osg::Node> node = osgDB::readNodeFile(shape._fileName);
+      if (node.valid())
+      {
+        osg::ref_ptr<CADFile> cad = new CADFile(node.get());
+
+        transf->addChild(cad.get());
+      }
+    }
+    else if (shape._type.compare("stl") == 0)
+    { //stl node
       //std::cout<<"It's a stl and the filename is "<<shape._fileName<<std::endl;
       // Disable mesh optimization because it is too expensive (see OSG commit a082b57)
@@ -1413 +1430 @@
      {
       ShapeObject* shape = _visualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0)
+      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0 or
+          shape->_type.compare("obj") == 0 or shape->_type.compare("3ds") == 0)
       {
         //it's a cad file so we have to rescale the underlying geometry vertices
@@ -1546 +1564 @@
     osg::ref_ptr<osg::StateSet> stateSet = nullptr;
     bool geometryColors = false;
+    bool is3DSShape = false;
 
     if (_visualizer->isShape()) {
       ShapeObject* shape = _visualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
+      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0 or
+          shape->_type.compare("obj") == 0 or shape->_type.compare("3ds") == 0) {
         osg::ref_ptr<osg::Transform> transformNode = shape->getTransformNode();
         if (transformNode.valid() && transformNode->getNumChildren() > 0) {
@@ -1556 +1576 @@
             stateSet = cad->getOrCreateStateSet();
             geometryColors = !shape->getVisualProperties()->getColor().custom();
+            is3DSShape = shape->_type.compare("3ds") == 0;
           }
         }
@@ -1577 +1598 @@
       changeTransparencyOfMaterial(ss, transparency);
       if (geometryColors) {
-        changeTransparencyOfGeometry(node, transparency);
-      }
-    }
+        if (is3DSShape) {
+          changeTransparencyOfGeometry<osg::Vec4ubArray, 255>(node, transparency);
+        } else {
+          changeTransparencyOfGeometry<osg::Vec4Array, 1>    (node, transparency);
+        }
+      }
+    }
+
     if (changeTexture) {
       //set texture
@@ -1700 +1726 @@
  * changes transparency of a geode's geometry
  */
+template<typename Vec4Array, unsigned int scale>
 void UpdateVisitor::changeTransparencyOfGeometry(osg::Geode& geode, const float transparency)
 {
-  osg::Vec4::value_type opacity = 1.0 - transparency;
+  using Vec4 = typename Vec4Array::ElementDataType;
+  using type = typename Vec4::value_type;
+  type opacity = (1.0 - transparency) * scale;
   unsigned int num = geode.getNumDrawables();
   for (unsigned int i = 0; i < num; i++) {
@@ -1709 +1738 @@
       osg::Geometry* geometry = drawable->asGeometry();
       if (geometry) {
-        osg::Vec4Array* colors = dynamic_cast<osg::Vec4Array*>(geometry->getColorArray());
+        Vec4Array* colors = dynamic_cast<Vec4Array*>(geometry->getColorArray());
         if (colors) {
-          for (osg::Vec4& color : colors->asVector()) {
+          for (Vec4& color : colors->asVector()) {
             color.a() = opacity;
           }
@@ -1862 +1891 @@
 
   osg::Matrix3 T0;
-  if (type == "stl" || type == "dxf")
+  if (type == "dxf" || type == "stl" || type == "obj" || type == "3ds")
   {
     T0 = osg::Matrix3(dirs._lDir[0], dirs._lDir[1], dirs._lDir[2],

OMEdit/OMEditLIB/Animation/Visualization.h

@@ -100 +100 @@
   void changeColorOfMaterial(osg::StateSet* ss, const osg::Material::ColorMode mode, const QColor color, const float specular);
   void changeTransparencyOfMaterial(osg::StateSet* ss, const float transparency);
+  template<typename Vec4Array, unsigned int scale>
   void changeTransparencyOfGeometry(osg::Geode& geode, const float transparency);
 public: