Added support for OCCT 7.6.2 #971

rainman110 · 2023-10-17T14:44:05Z

OpenCASCADE 7.6.2 support

Description

I adapted the code to allow TiGL to be used with OCCT 7.6.1 as well.
Fixes #973

How Has This Been Tested?

I compiled it with OCCT 7.6.1, executed the unit tests, and started TiGL Viewer.

Here are some notes:

The colors in TiGL Viewer are somewhat (slightly) different due to the new Color Space in OCCT
The test WingSegmentGuideCurves.tiglWingGetSegmentUpperSurfaceAreaTrimmed is failing due to some tolerance error. I did not look into it further.

Screenshots, that help to understand the changes(if applicable):

Checklist:

A test for the new functionality was added.
All tests run without failure.
The new code complies with the TiGL style guide.
New classes have been added to the Python interface.
API changes were documented properly in tigl.h.

joergbrech · 2023-10-17T15:06:36Z

Thanks @rainman110! I will have a look at the failing test

rainman110 · 2023-10-17T20:19:20Z

Do you have any idea, why the ci is not working at all?

joergbrech · 2023-10-18T07:01:25Z

Hmm, seems that we need to update the workflow file again...https://github.com/DLR-SC/tigl/actions/runs/6548880919. It is a bit of a pain that github actions are so unstable...

#972

rainman110 · 2023-11-06T11:47:34Z

I fixed a shader problem (see #973). It is now working again:

joergbrech · 2023-11-21T08:06:28Z

@rainman110, I will rebase on master to see if CI is triggered.

rainman110 · 2023-11-22T09:27:56Z

So, it does not compile anymore with OCCT 7.4.0 🤦 . @joergbrech Do you already have the (proper) changes in Geoml, so that we can backport it to TiGL?

joergbrech · 2023-11-22T09:47:09Z

So, it does not compile anymore with OCCT 7.4.0 🤦 . @joergbrech Do you already have the (proper) changes in Geoml, so that we can backport it to TiGL?

Unfortunately no, because in paraDiGMS we fixed the OCCT version to 7.6.2 so we never had the need to build it with OCCT 7.4.0.

rainman110 · 2023-12-07T14:30:24Z

The code now compiles with both OCCT 7.4.0 and 7.6.1. Something is wrong though with the macos test job, but this should not be related to the PR.

rainman110 · 2023-12-08T09:33:45Z

Oh... I see, that I fckd up the git history 🤦

rainman110 · 2023-12-08T10:09:24Z

The history is clean again

codecov · 2023-12-08T10:21:42Z

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (master@363a4ac). Click here to learn what that means.

Additional details and impacted files

@@            Coverage Diff            @@
##             master     #971   +/-   ##
=========================================
  Coverage          ?   68.95%           
=========================================
  Files             ?      299           
  Lines             ?    26499           
  Branches          ?        0           
=========================================
  Hits              ?    18272           
  Misses            ?     8227           
  Partials          ?        0

Files	Coverage Δ
src/boolean_operations/GEOMAlgo_Splitter.cxx	`30.61% <ø> (ø)`
src/common/tiglcommonfunctions.cpp	`74.58% <ø> (ø)`
src/configuration/CCPACSConfiguration.cpp	`57.14% <ø> (ø)`
...c/control_devices/CControlSurfaceBorderBuilder.cpp	`76.96% <ø> (ø)`
src/wing/CCPACSWingSegment.cpp	`84.24% <ø> (ø)`
src/geometry/CTiglTriangularizer.cpp	`85.71% <60.00%> (ø)`

joergbrech · 2023-12-11T09:36:01Z

Awesome! Thanks so much @rainman110. I will try to build this branch with OCCT 7.6 and if it works we are good to merge.

joergbrech · 2023-12-13T11:53:21Z

Hmm, I am having trouble building TiGL with OCCT 7.6.2.

Several classes include V3d_Coordinate.hxx which basically just contains a typedef. This file was removed: https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=7fd4958d451a9c8dcf1c58e100c8ac898484addd. If I am not mistaken, we should replace all occurences of V3d_Coordinate with Standard_Real.
TiglViewerInternal.h includes MMgt_TShared.hxx which has been removed: https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=f4e7c3078527877b5d1f13f2c74982be4450e14b. I believe we can just remove the include. I don't think it is used.
CCPACSConfiguration.cpp includes BRepAlgo_Fuse.hxx which has been removed: https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=efac1733770f766f136694da42454bdd0db62c67. I believe we can just remove the include. I don't think it is used.

@rainman110, could you verify this?

joergbrech · 2023-12-13T11:55:40Z

@rainman110, if you like, I can take over from here (but please give me a heads-up if this is ok for you, so that I don't mess around in your branch). Thank you very much!

I propose to

update the code according to my previous comment
wait until Update OCCT and pythonocc to 7.6.2 tigl-conda#32 is merged
Update the used occt version in CI here and see if the CI here is successfull
Merge

Note: The test WingSegmentGuideCurves.tiglWingGetSegmentUpperSurfaceAreaTrimmed is failing due to some tolerance error. I did not look into it further.

Closes #973

The stripes were computed based on the normal vector of the vertex, not on the fragment. This lead to visual distortions. Now, we use the normal vector from the fragment shader as offered by the occt api.

joergbrech · 2024-01-09T16:08:36Z

Ok so I tested this locally on Ubuntu 20.04 with the new opencascade anaconda packages for version 7.6.2 in our dlr-sc channel. There still was an issue with a faulty integration test which succeeded with opencasce 7.4, but not with 7.6.2 which can easily be fixed.

I will allow myself to rebase this on master and fix the test. Then I am fine to merge. Sorry for keeping this open so long.

joergbrech · 2024-01-09T16:13:10Z

I will not yet update the opencascade version in our CI to 7.6.2, because one CI job uses the anaconda package opencascade-static, which is still at 7.4.0, see also DLR-SC/tigl-conda#37. @rainman110, do you remember where these packages came from? Did you build them locally?

Note to self: Bumping the opencascade version actually used in our release boils down to modifying the environment.yml here and the conda recipe at https://github.com/DLR-SC/tigl-conda after the next release.

rainman110 · 2024-01-09T18:20:38Z

I used the recipes from the TiGL repo: https://github.com/DLR-SC/tigl/tree/master/ci/conda

joergbrech force-pushed the occt_761 branch from d7e763f to 9be8a94 Compare November 21, 2023 08:07

joergbrech self-assigned this Nov 22, 2023

rainman110 force-pushed the occt_761 branch from d35551e to 03bc3bf Compare December 8, 2023 10:08

joergbrech mentioned this pull request Dec 14, 2023

some changes for compatibility with OCCT 7.6.2 #983

Merged

rainman110 and others added 5 commits January 9, 2024 15:04

Added support for OCCT 7.6.1

1f0aeea

Note: The test WingSegmentGuideCurves.tiglWingGetSegmentUpperSurfaceAreaTrimmed is failing due to some tolerance error. I did not look into it further.

Fixed outdated shaders

772ad64

Closes #973

Improved visual quality of zebra stripes

026714d

The stripes were computed based on the normal vector of the vertex, not on the fragment. This lead to visual distortions. Now, we use the normal vector from the fragment shader as offered by the occt api.

Fix compilation with OCCT 7.4

17b4020

some changes for compatibility with OCCT 7.6.2

69da360

fix faulty integration test

0f68791

joergbrech force-pushed the occt_761 branch from cd087d8 to 0f68791 Compare January 9, 2024 16:09

joergbrech approved these changes Jan 9, 2024

View reviewed changes

joergbrech changed the title ~~Added support for OCCT 7.6.1~~ Added support for OCCT 7.6.2 Jan 9, 2024

joergbrech merged commit ab2e704 into master Jan 9, 2024
17 checks passed

joergbrech deleted the occt_761 branch January 9, 2024 20:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support for OCCT 7.6.2 #971

Added support for OCCT 7.6.2 #971

rainman110 commented Oct 17, 2023 •

edited by joergbrech

Loading

joergbrech commented Oct 17, 2023

rainman110 commented Oct 17, 2023

joergbrech commented Oct 18, 2023 •

edited

Loading

rainman110 commented Nov 6, 2023

joergbrech commented Nov 21, 2023

rainman110 commented Nov 22, 2023

joergbrech commented Nov 22, 2023

rainman110 commented Dec 7, 2023

rainman110 commented Dec 8, 2023

rainman110 commented Dec 8, 2023

codecov bot commented Dec 8, 2023 •

edited

Loading

joergbrech commented Dec 11, 2023

joergbrech commented Dec 13, 2023

joergbrech commented Dec 13, 2023 •

edited

Loading

joergbrech commented Jan 9, 2024

joergbrech commented Jan 9, 2024

rainman110 commented Jan 9, 2024

Added support for OCCT 7.6.2 #971

Added support for OCCT 7.6.2 #971

Conversation

rainman110 commented Oct 17, 2023 • edited by joergbrech Loading

Description

How Has This Been Tested?

Screenshots, that help to understand the changes(if applicable):

Checklist:

joergbrech commented Oct 17, 2023

rainman110 commented Oct 17, 2023

joergbrech commented Oct 18, 2023 • edited Loading

rainman110 commented Nov 6, 2023

joergbrech commented Nov 21, 2023

rainman110 commented Nov 22, 2023

joergbrech commented Nov 22, 2023

rainman110 commented Dec 7, 2023

rainman110 commented Dec 8, 2023

rainman110 commented Dec 8, 2023

codecov bot commented Dec 8, 2023 • edited Loading

Codecov Report

joergbrech commented Dec 11, 2023

joergbrech commented Dec 13, 2023

joergbrech commented Dec 13, 2023 • edited Loading

joergbrech commented Jan 9, 2024

joergbrech commented Jan 9, 2024

rainman110 commented Jan 9, 2024

rainman110 commented Oct 17, 2023 •

edited by joergbrech

Loading

joergbrech commented Oct 18, 2023 •

edited

Loading

codecov bot commented Dec 8, 2023 •

edited

Loading

joergbrech commented Dec 13, 2023 •

edited

Loading