Skip to content

Commit

Permalink
Get rid of warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@adeas31
adeas31 committed Oct 2, 2019
1 parent 990f175 commit 1ba9373
Show file tree
Hide file tree
Showing 66 changed files with 555 additions and 522 deletions.
261 changes: 259 additions & 2 deletions OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.cpp
View file

Large diffs are not rendered by default.

258 changes: 0 additions & 258 deletions OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.h
View file
Expand Up @@ -105,262 +105,4 @@ class DXFile : public osg::Geometry
std::string fileName;
};


const osg::Vec4f colorArray[] = {osg::Vec4f(0.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 255.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(65.0/255.0, 65.0/255.0, 65.0/255.0, 1.0),
osg::Vec4f(128.0/255.0, 128.0/255.0, 128.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 170.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 126.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 86.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 69.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 0.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 53.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 63.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 191.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 46.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 141.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 31.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 96.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 25.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 78.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 19.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 59.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 127.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 212.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 94.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 157.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 64.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 107.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 52.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 86.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 39.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 66.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 191.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 234.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 141.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 173.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 96.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 118.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 78.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 95.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 59.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 73.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 255.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 189.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 189.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 129.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 129.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 104.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 104.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 79.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 79.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(191.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(234.0/255.0, 255.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(141.0/255.0, 189.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(173.0/255.0, 189.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(96.0/255.0, 129.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(118.0/255.0, 129.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(78.0/255.0, 104.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(95.0/255.0, 104.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(59.0/255.0, 79.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(73.0/255.0, 79.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(127.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(212.0/255.0, 255.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(94.0/255.0, 189.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(157.0/255.0, 189.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(64.0/255.0, 129.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(107.0/255.0, 129.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(52.0/255.0, 104.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 104.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(39.0/255.0, 79.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(66.0/255.0, 79.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(63.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(191.0/255.0, 255.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(46.0/255.0, 189.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(141.0/255.0, 189.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(31.0/255.0, 129.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(96.0/255.0, 129.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(25.0/255.0, 104.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(78.0/255.0, 104.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(19.0/255.0, 79.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(59.0/255.0, 79.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 255.0/255.0, 170.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 189.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 189.0/255.0, 126.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 129.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 129.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 104.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 104.0/255.0, 69.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 79.0/255.0, 0.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 79.0/255.0, 53.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 63.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 255.0/255.0, 191.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 189.0/255.0, 46.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 189.0/255.0, 141.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 129.0/255.0, 31.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 129.0/255.0, 96.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 104.0/255.0, 25.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 104.0/255.0, 78.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 79.0/255.0, 19.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 79.0/255.0, 59.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 127.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 255.0/255.0, 212.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 189.0/255.0, 94.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 189.0/255.0, 157.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 129.0/255.0, 64.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 129.0/255.0, 107.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 104.0/255.0, 52.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 104.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 79.0/255.0, 39.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 79.0/255.0, 66.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 191.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 255.0/255.0, 234.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 189.0/255.0, 141.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 189.0/255.0, 173.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 129.0/255.0, 96.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 129.0/255.0, 118.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 104.0/255.0, 78.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 104.0/255.0, 95.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 79.0/255.0, 59.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 79.0/255.0, 73.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 255.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 255.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 189.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 189.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 129.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 129.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 104.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 104.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 79.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 79.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 191.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 234.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 141.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 173.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 96.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 118.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 78.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 95.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 59.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 73.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 127.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 212.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 94.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 157.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 64.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 107.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 52.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 86.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 39.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 66.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 63.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 191.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 46.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 141.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 31.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 96.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 25.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 78.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 19.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 59.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(170.0/255.0, 170.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(126.0/255.0, 126.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 86.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(69.0/255.0, 69.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(0.0/255.0, 0.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(53.0/255.0, 53.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(63.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(191.0/255.0, 170.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(46.0/255.0, 0.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(141.0/255.0, 126.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(31.0/255.0, 0.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(96.0/255.0, 86.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(25.0/255.0, 0.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(78.0/255.0, 69.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(19.0/255.0, 0.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(59.0/255.0, 53.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(127.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(212.0/255.0, 170.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(94.0/255.0, 0.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(157.0/255.0, 126.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(64.0/255.0, 0.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(107.0/255.0, 86.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(52.0/255.0, 0.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(86.0/255.0, 69.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(39.0/255.0, 0.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(66.0/255.0, 53.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(191.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(234.0/255.0, 170.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(141.0/255.0, 0.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(173.0/255.0, 126.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(96.0/255.0, 0.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(118.0/255.0, 86.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(78.0/255.0, 0.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(95.0/255.0, 69.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(59.0/255.0, 0.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(73.0/255.0, 53.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 170.0/255.0, 255.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 0.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 126.0/255.0, 189.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 0.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 86.0/255.0, 129.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 0.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 69.0/255.0, 104.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 0.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 53.0/255.0, 79.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 191.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 170.0/255.0, 234.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 0.0/255.0, 141.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 126.0/255.0, 173.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 0.0/255.0, 96.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 86.0/255.0, 118.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 0.0/255.0, 78.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 69.0/255.0, 95.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 0.0/255.0, 59.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 53.0/255.0, 73.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 127.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 170.0/255.0, 212.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 0.0/255.0, 94.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 126.0/255.0, 157.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 0.0/255.0, 64.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 86.0/255.0, 107.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 0.0/255.0, 52.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 69.0/255.0, 86.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 0.0/255.0, 39.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 53.0/255.0, 66.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 0.0/255.0, 63.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 170.0/255.0, 191.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 0.0/255.0, 46.0/255.0, 1.0),
osg::Vec4f(189.0/255.0, 126.0/255.0, 141.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 0.0/255.0, 31.0/255.0, 1.0),
osg::Vec4f(129.0/255.0, 86.0/255.0, 96.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 0.0/255.0, 25.0/255.0, 1.0),
osg::Vec4f(104.0/255.0, 69.0/255.0, 78.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 0.0/255.0, 19.0/255.0, 1.0),
osg::Vec4f(79.0/255.0, 53.0/255.0, 59.0/255.0, 1.0),
osg::Vec4f(51.0/255.0, 51.0/255.0, 51.0/255.0, 1.0),
osg::Vec4f(80.0/255.0, 80.0/255.0, 80.0/255.0, 1.0),
osg::Vec4f(105.0/255.0, 105.0/255.0, 105.0/255.0, 1.0),
osg::Vec4f(130.0/255.0, 130.0/255.0, 130.0/255.0, 1.0),
osg::Vec4f(190.0/255.0, 190.0/255.0, 190.0/255.0, 1.0),
osg::Vec4f(255.0/255.0, 255.0/255.0, 255.0/255.0, 1.0)};

#endif //end EXTRASHAPES_H
5 changes: 4 additions & 1 deletion OMEdit/OMEdit/OMEditGUI/Animation/FMUWrapper.cpp
View file
Expand Up @@ -168,6 +168,7 @@ unsigned int FMUWrapper_ME_1::fmi_get_variable_by_name(const char* name)

void FMUWrapper_ME_1::load(const std::string& modelFile, const std::string& path, fmi_import_context_t* context)
{
Q_UNUSED(modelFile);
//Callbackfunctions
mCallBackFunctions.logger = fmi1_log_forwarding;
mCallBackFunctions.allocateMemory = calloc;
Expand Down Expand Up @@ -221,7 +222,7 @@ void FMUWrapper_ME_1::initialize(const std::shared_ptr<SimSettingsFMU> simSettin
mFMUdata._stateNames.push_back(fmi1_import_get_variable_name(stateVar));
}
} else {
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, QObject::tr("fmi1_import_get_state_value_references returned failure code"+mFMUdata._fmiStatus),
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, QString("%1 %2").arg(QObject::tr("fmi1_import_get_state_value_references returned failure code %1")).arg(mFMUdata._fmiStatus),
Helper::scriptingKind, Helper::errorLevel));
}

Expand Down Expand Up @@ -377,6 +378,7 @@ void FMUWrapper_ME_2::fmi_get_real(unsigned int* valueRef, double* res)

void FMUWrapper_ME_2::load(const std::string& modelFile, const std::string& path, fmi_import_context_t* context)
{
Q_UNUSED(modelFile);
//Callbackfunctions
mCallBackFunctions.logger = fmi2_log_forwarding;
mCallBackFunctions.allocateMemory = calloc;
Expand Down Expand Up @@ -542,6 +544,7 @@ void FMUWrapper_ME_2::updateNextTimeStep(const double hdef)

void FMUWrapper_ME_2::handleEvents(const int intermediateResults)
{
Q_UNUSED(intermediateResults);
//std::cout<<"Handle event at "<<std::to_string(mFMUdata._tcur)<<std::endl;
mFMUdata.fmiStatus2 = fmi2_import_enter_event_mode(mpFMU);
do_event_iteration(mpFMU, &mFMUdata.eventInfo2);
Expand Down
20 changes: 10 additions & 10 deletions OMEdit/OMEdit/OMEditGUI/Animation/ViewerWidget.h
View file
Expand Up @@ -77,16 +77,16 @@ class ViewerWidget : public GLWidget
void setSelectedShape(std::string shape) {mSelectedShape = shape;}
void pickShape(int x, int y);
protected:
virtual void paintEvent(QPaintEvent *paintEvent);
virtual void paintGL();
virtual void resizeGL(int width, int height);
virtual void keyPressEvent(QKeyEvent *event);
virtual void keyReleaseEvent(QKeyEvent *event);
virtual void mouseMoveEvent(QMouseEvent *event);
virtual void mousePressEvent(QMouseEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *event);
virtual void wheelEvent(QWheelEvent *event);
virtual bool event(QEvent* event);
virtual void paintEvent(QPaintEvent *paintEvent) override;
virtual void paintGL() override;
virtual void resizeGL(int width, int height) override;
virtual void keyPressEvent(QKeyEvent *event) override;
virtual void keyReleaseEvent(QKeyEvent *event) override;
virtual void mouseMoveEvent(QMouseEvent *event) override;
virtual void mousePressEvent(QMouseEvent *event) override;
virtual void mouseReleaseEvent(QMouseEvent *event) override;
virtual void wheelEvent(QWheelEvent *event) override;
virtual bool event(QEvent* event) override;
void showShapePickContextMenu(const QPoint& pos);
private:
osgGA::EventQueue* getEventQueue() const;
Expand Down
8 changes: 4 additions & 4 deletions OMEdit/OMEdit/OMEditGUI/Animation/Visualizer.h
View file
Expand Up @@ -67,8 +67,8 @@ class UpdateVisitor : public osg::NodeVisitor
virtual ~UpdateVisitor() = default;
UpdateVisitor(const UpdateVisitor& uv) = delete;
UpdateVisitor& operator=(const UpdateVisitor& uv) = delete;
virtual void apply(osg::Geode& node);
virtual void apply(osg::MatrixTransform& node);
virtual void apply(osg::Geode& node) override;
virtual void apply(osg::MatrixTransform& node) override;
void makeTransparent(osg::Geode& node, float transpCoeff);
void applyTexture(osg::StateSet* ss, std::string imagePath);
void changeColor(osg::StateSet* ss, float r, float g, float b);
Expand All @@ -85,8 +85,8 @@ class InfoVisitor : public osg::NodeVisitor
InfoVisitor(const InfoVisitor& iv) = delete;
InfoVisitor& operator=(const InfoVisitor& iv) = delete;
std::string spaces();
virtual void apply(osg::Node& node);
virtual void apply(osg::Geode& node);
virtual void apply(osg::Node& node) override;
virtual void apply(osg::Geode& node) override;
private:
unsigned int _level;
};
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEdit/OMEditGUI/Animation/VisualizerFMU.cpp
View file
Expand Up @@ -182,7 +182,6 @@ void VisualizerFMU::updateSystem()
{
// Set states
mpFMU->setContinuousStates();
int zero_crossning_event = 0;
mpFMU->prepareSimulationStep(mpTimeManager->getVisTime());
bool zeroCrossingEvent = mpFMU->checkForTriggeredEvent();
if (mpSimSettings->getIterateEvents() && (mpSimSettings->getCallEventUpdate() || zeroCrossingEvent || mpFMU->itsEventTime()))
Expand All @@ -199,7 +198,6 @@ void VisualizerFMU::updateSystem()

double VisualizerFMU::simulateStep(const double time)
{
int zero_crossning_event = 0;
mpFMU->prepareSimulationStep(time);

// Check if an event indicator has triggered
Expand Down Expand Up @@ -242,6 +240,7 @@ double VisualizerFMU::simulateStep(const double time)

void VisualizerFMU::initializeVisAttributes(const double time)
{
Q_UNUSED(time);
mpFMU->initialize(mpSimSettings);
//std::cout<<"VisualizerFMU::loadFMU: FMU was successfully initialized."<<std::endl;

Expand Down Expand Up @@ -323,6 +322,7 @@ void VisualizerFMU::updateVisAttributes(const double time)

void VisualizerFMU::updateScene(const double time)
{
Q_UNUSED(time);
mpTimeManager->updateTick(); //for real-time measurement

mpTimeManager->setSimTime(mpTimeManager->getVisTime());
Expand Down
3 changes: 2 additions & 1 deletion OMEdit/OMEdit/OMEditGUI/Animation/VisualizerMAT.cpp
View file
Expand Up @@ -84,7 +84,8 @@ void VisualizerMAT::readMat(const std::string& modelFile, const std::string& pat
else
{
// Read mat file.
auto ret = omc_new_matlab4_reader(resFileName.c_str(), &_matReader);
omc_new_matlab4_reader(resFileName.c_str(), &_matReader);
//auto ret = omc_new_matlab4_reader(resFileName.c_str(), &_matReader);
// Check return value.
// if (0 != ret)
// {
Expand Down

0 comments on commit 1ba9373

Please sign in to comment.