Changeset bf804e32 in OpenModelica

Timestamp:

2023-03-30T11:40:26+02:00 (13 months ago)

Author:

Adeel Asghar <adeel.asghar@…>

Parents:

23c6c6f6

git-author:

anotheruserofgithub <96748782+anotheruserofgithub@…> (03/30/23 11:27:48)

git-committer:

Adeel Asghar <adeel.asghar@…> (03/30/23 11:40:26)

Message:

[OMEdit] Support OBJ & 3DS files as CAD shapes (#10377)

• Support OBJ & 3DS files as CAD shapes

• Clean up functions for CAD file checks

• Add helper functions for CAD type checks

Location:

OMEdit/OMEditLIB/Animation

Files:

• AnimationUtil.h (modified) (3 diffs)
• ViewerWidget.cpp (modified) (3 diffs)
• ViewerWidget.h (modified) (1 diff)
• Visualization.cpp (modified) (13 diffs)
• Visualization.h (modified) (1 diff)

OMEdit/OMEditLIB/Animation/AnimationUtil.h

@@ -36 +36 @@
 #define ANIMATIONUTIL_H
 
+#include <QFileInfo>
 #include <QString>
-#include <QRegExp>
-#include <QFileInfo>
-
-#include <QOpenGLContext> // must be included before OSG headers
-
-#include <sys/stat.h>
+
 #include <string>
-#include <osg/Vec3>
 
 #include "MainWindow.h"
@@ -126 +121 @@
 }
 
-/*! \brief Checks if the type is a cad file
- */
-inline bool isCADType(const std::string& typeName)
-{
-  return ((typeName.size() >= 12 && std::string(typeName.begin(), typeName.begin() + 11) == "modelica://")
-          || (typeName.size() >= 8 && std::string(typeName.begin(), typeName.begin() + 7) == "file://"));
-}
-
-
-inline bool dxfFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("dxf");
-}
-
-
-inline bool stlFileType(const std::string& typeName)
-{
-  return typeName.substr(typeName.size()-3) == std::string("stl");
-}
-
-
-/*! \brief Get file name of the cad file
- */
-inline std::string extractCADFilename(const std::string& s)
-{
-  QString str(s.c_str());
+/*!
+ * \brief Gets the filename of the CAD file
+ */
+inline std::string extractCADFilename(const std::string& typeName)
+{
+  QString str(typeName.c_str());
   if (str.startsWith("modelica://")) {
     const QString absoluteFileName = MainWindow::instance()->getOMCProxy()->uriToFilename(str);
     return absoluteFileName.toStdString();
   } else {
-    std::string fileKey = "file://";
-    std::string s2 = s.substr(fileKey.length(), s.length());
-    return s2;
+    const std::string fileKey = "file://";
+    return typeName.substr(fileKey.length(), typeName.length());
   }
 }
 
+/*!
+ * \brief Checks if the type is a CAD file
+ */
+inline bool isCADFile(const std::string& typeName)
+{
+  return ((typeName.size() >= 12 && std::string(typeName.begin(), typeName.begin() + 11) == "modelica://") ||
+          (typeName.size() >=  8 && std::string(typeName.begin(), typeName.begin() +  7) == "file://"));
+}
+
+inline bool isDXFFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "dxf";
+}
+
+inline bool isSTLFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "stl";
+}
+
+inline bool isOBJFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "obj";
+}
+
+inline bool is3DSFile(const std::string& fileName)
+{
+  return fileName.substr(fileName.size() - 3) == "3ds";
+}
+
+inline bool isDXFType(const std::string& type)
+{
+  return type == "DXF";
+}
+
+inline bool isSTLType(const std::string& type)
+{
+  return type == "STL";
+}
+
+inline bool isOBJType(const std::string& type)
+{
+  return type == "OBJ";
+}
+
+inline bool is3DSType(const std::string& type)
+{
+  return type == "3DS";
+}
+
+inline bool isCADType(const std::string& type)
+{
+  return isDXFType(type) || isSTLType(type) || isOBJType(type) || is3DSType(type);
+}
+
+inline bool isSimpleCADType(const std::string& type)
+{
+  return isDXFType(type) || isSTLType(type);
+}
+
+inline bool isAdvancedCADType(const std::string& type)
+{
+  return isOBJType(type) || is3DSType(type);
+}
+
 inline const char* boolToString(bool b)
 {
@@ -167 +205 @@
 }
 
-
 #endif //ANIMATIONUTIL_H

OMEdit/OMEditLIB/Animation/ViewerWidget.cpp

@@ -404 +404 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));
@@ -427 +427 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));
@@ -455 +455 @@
     if (mpSelectedVisualizer->isShape()) {
       ShapeObject* shape = mpSelectedVisualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0) {
-        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.compare("dxf") == 0 ? "DXF" : "STL");
+      if (isSimpleCADType(shape->_type)) {
+        QString msg = tr("Texture feature is not applicable for %1 files.").arg(shape->_type.c_str());
         MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg,
                                                               Helper::scriptingKind, Helper::notificationLevel));

OMEdit/OMEditLIB/Animation/ViewerWidget.h

@@ -48 +48 @@
 
 #include "AbstractAnimationWindow.h"
+#include "AnimationUtil.h"
 #include "Util/Helper.h"
 

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>
@@ -317 +318 @@
     shape._type = std::string(expNode->value());
 
-    if (isCADType(shape._type))
+    if (isCADFile(shape._type))
     {
       shape._fileName = extractCADFilename(shape._type);
@@ -328 +329 @@
       }
 
-      if (dxfFileType(shape._fileName)) {
-        shape._type = "dxf";
-      } else if (stlFileType(shape._fileName)) {
-        shape._type = "stl";
+      if (isDXFFile(shape._fileName)) {
+        shape._type = "DXF";
+      } else if (isSTLFile(shape._fileName)) {
+        shape._type = "STL";
+      } else if (isOBJFile(shape._fileName)) {
+        shape._type = "OBJ";
+      } else if (is3DSFile(shape._fileName)) {
+        shape._type = "3DS";
       }
     }
@@ -791 +796 @@
         // Store the radius of relevant shapes
         for (ShapeObject& shape : relevantShapes) {
-          // Consider OpenSceneGraph shape drawables only
-          if (shape._type.compare("dxf") == 0 || shape._type.compare("stl") == 0) {
+          // Consider OSG shape drawables only
+          if (isCADType(shape._type)) {
             continue;
           }
@@ -1282 +1287 @@
     transf->setName(shape._id);
 
-    if (shape._type.compare("stl") == 0)
-    { //cad node
+    if (isAdvancedCADType(shape._type))
+    { //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 (isSTLType(shape._type))
+    { //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)
@@ -1295 +1311 @@
       }
     }
-    else if (shape._type.compare("dxf") == 0)
+    else if (isDXFType(shape._type))
     { //geode with dxf drawable
       //std::cout<<"It's a dxf and the filename is "<<shape._fileName<<std::endl;
@@ -1413 +1429 @@
      {
       ShapeObject* shape = _visualizer->asShape();
-      if (shape->_type.compare("dxf") == 0 or shape->_type.compare("stl") == 0)
+      if (isCADType(shape->_type))
       {
         //it's a cad file so we have to rescale the underlying geometry vertices
@@ -1546 +1562 @@
     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 (isCADType(shape->_type)) {
         osg::ref_ptr<osg::Transform> transformNode = shape->getTransformNode();
         if (transformNode.valid() && transformNode->getNumChildren() > 0) {
@@ -1556 +1573 @@
             stateSet = cad->getOrCreateStateSet();
             geometryColors = !shape->getVisualProperties()->getColor().custom();
+            is3DSShape = is3DSType(shape->_type);
           }
         }
@@ -1577 +1595 @@
       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 +1723 @@
  * 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 +1735 @@
       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 +1888 @@
 
   osg::Matrix3 T0;
-  if (type == "stl" || type == "dxf")
+  if (isCADType(type))
   {
     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: