-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also making a stab at trying to get our CMakeLists.txt closer to the upstream file. Still significant differences, but trying to work towards minimizing them for easier updating.
- Loading branch information
1 parent
6e75eb2
commit 5fbc05d
Showing
28 changed files
with
927 additions
and
2,077 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| diff -Naur opennurbs/android_uuid/COPYING OPENNURBS_BLD/android_uuid/COPYING | ||
| --- opennurbs/android_uuid/COPYING 2023-12-20 11:22:46.198511306 -0500 | ||
| +++ OPENNURBS_BLD/android_uuid/COPYING 2023-12-20 10:56:56.954787994 -0500 | ||
| --- opennurbs/android_uuid/COPYING 2024-06-25 15:40:38.715532582 -0400 | ||
| +++ OPENNURBS_BLD/android_uuid/COPYING 2024-06-25 15:41:49.962365115 -0400 | ||
| @@ -1,3 +1,5 @@ | ||
| +Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. | ||
| + | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
| +Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o. | ||
| + | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| --- opennurbs/opennurbs_brep.cpp 2024-02-16 13:44:43.176776155 -0500 | ||
| +++ OPENNURBS_BLD/opennurbs_brep.cpp 2024-02-16 13:49:38.419887610 -0500 | ||
| @@ -3578,6 +3578,10 @@ | ||
| } | ||
| } | ||
|
|
||
| + // BRL-CAD uses this for a tolerance check below | ||
| + const ON_Surface *surf = loop.Face()->SurfaceOf(); | ||
| + double urange = (surf) ? (surf->Domain(0)[1] - surf->Domain(0)[0]) : DBL_MAX; | ||
| + double vrange = (surf) ? (surf->Domain(1)[1] - surf->Domain(1)[0]) : DBL_MAX; | ||
|
|
||
| // make sure ends of trims jibe | ||
| int ci0, ci1, next_lti; | ||
| @@ -3606,6 +3610,12 @@ | ||
| // didn't get flagged as bad. | ||
| double xtol = (fabs(P0.x) + fabs(P1.x))*1.0e-10; | ||
| double ytol = (fabs(P0.y) + fabs(P1.y))*1.0e-10; | ||
| + | ||
| + // Oct 12 2009 Rather than using the above check, BRL-CAD uses | ||
| + // relative uv size if it is available | ||
| + xtol = (urange < DBL_MAX) ? urange * trim0.m_tolerance[0] : xtol; | ||
| + ytol = (vrange < DBL_MAX) ? vrange * trim0.m_tolerance[1] : ytol; | ||
| + | ||
| if ( xtol < ON_ZERO_TOLERANCE ) | ||
| xtol = ON_ZERO_TOLERANCE; | ||
| if ( ytol < ON_ZERO_TOLERANCE ) | ||
| --- opennurbs/opennurbs_brep.cpp 2024-06-25 15:28:09.117849296 -0400 | ||
| +++ OPENNURBS_BLD/opennurbs_brep.cpp 2024-06-25 15:26:59.805993657 -0400 | ||
| @@ -3595,6 +3595,10 @@ | ||
| } | ||
| } | ||
|
|
||
| + // BRL-CAD uses this for a tolerance check below | ||
| + const ON_Surface *surf = loop.Face()->SurfaceOf(); | ||
| + double urange = (surf) ? (surf->Domain(0)[1] - surf->Domain(0)[0]) : DBL_MAX; | ||
| + double vrange = (surf) ? (surf->Domain(1)[1] - surf->Domain(1)[0]) : DBL_MAX; | ||
|
|
||
| // make sure ends of trims jibe | ||
| int ci0, ci1, next_lti; | ||
| @@ -3623,6 +3627,12 @@ | ||
| // didn't get flagged as bad. | ||
| double xtol = (fabs(P0.x) + fabs(P1.x))*1.0e-10; | ||
| double ytol = (fabs(P0.y) + fabs(P1.y))*1.0e-10; | ||
| + | ||
| + // Oct 12 2009 Rather than using the above check, BRL-CAD uses | ||
| + // relative uv size if it is available | ||
| + xtol = (urange < DBL_MAX) ? urange * trim0.m_tolerance[0] : xtol; | ||
| + ytol = (vrange < DBL_MAX) ? vrange * trim0.m_tolerance[1] : ytol; | ||
| + | ||
| if ( xtol < ON_ZERO_TOLERANCE ) | ||
| xtol = ON_ZERO_TOLERANCE; | ||
| if ( ytol < ON_ZERO_TOLERANCE ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| --- opennurbs/opennurbs_brep.h 2024-02-16 13:44:43.176776155 -0500 | ||
| +++ OPENNURBS_BLD/opennurbs_brep.h 2024-02-16 14:00:20.173055503 -0500 | ||
| @@ -4141,6 +4141,7 @@ | ||
| ); | ||
|
|
||
| // helpers for validation checking | ||
| +public: | ||
| bool IsValidTrim(int trim_index,ON_TextLog* text_log) const; | ||
| bool IsValidTrimTopology(int trim_index,ON_TextLog* text_log) const; | ||
| bool IsValidTrimGeometry(int trim_index,ON_TextLog* text_log) const; | ||
| @@ -4166,6 +4167,7 @@ | ||
| bool IsValidVertexGeometry(int vertex_index,ON_TextLog* text_log) const; | ||
| bool IsValidVertexTolerancesAndFlags(int vertex_index,ON_TextLog* text_log) const; | ||
|
|
||
| +protected: | ||
| void SetTolsFromLegacyValues(); | ||
|
|
||
| // read helpers to support various versions | ||
| --- opennurbs/opennurbs_brep.h 2024-06-25 15:28:09.117849296 -0400 | ||
| +++ OPENNURBS_BLD/opennurbs_brep.h 2024-06-25 15:26:59.814993508 -0400 | ||
| @@ -4152,6 +4152,7 @@ | ||
| ); | ||
|
|
||
| // helpers for validation checking | ||
| +public: | ||
| bool IsValidTrim(int trim_index,ON_TextLog* text_log) const; | ||
| bool IsValidTrimTopology(int trim_index,ON_TextLog* text_log) const; | ||
| bool IsValidTrimGeometry(int trim_index,ON_TextLog* text_log) const; | ||
| @@ -4177,6 +4178,7 @@ | ||
| bool IsValidVertexGeometry(int vertex_index,ON_TextLog* text_log) const; | ||
| bool IsValidVertexTolerancesAndFlags(int vertex_index,ON_TextLog* text_log) const; | ||
|
|
||
| +protected: | ||
| void SetTolsFromLegacyValues(); | ||
|
|
||
| // read helpers to support various versions |
Oops, something went wrong.