search

rmast / GeometricTools-5.8-library

0 stars 0 forks source link

Looking for the exact version of these files I found a 4p5 file #1

Open rmast opened 2 years ago

rmast commented 2 years ago

https://github.com/zhouxs1023/GTE/blob/9183a1be705e7003f3cbdc4506275c42f5a261e0/Mathematics/AdaptiveSkeletonClimbing3.h

rmast commented 2 years ago

Yes! This repo, when getting that 4p5 commit has only this difference on the Mathematics-directory, most is commented out except for the BSplineCurveGenerate.h-file:

diff -r -w -b -B /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Mathematics/BSplineCurveFit.h Mathematics/BSplineCurveFit.h
12,13d11
< #include <iostream>^M
< using namespace std;^M
125c123
<             LogAssert(solved, "Failed to solve linear system...");^M
---
>             LogAssert(solved, "Failed to solve linear system.");
228,239d224
< /*^M
<         void SplineGenerate(Real t, vector<Real> ControlData, Real* position) const^M
<         {^M
<             int imin, imax;^M
<             mBasis.Evaluate(t, 0, imin, imax);^M
< ^M
<             Real const* source = &ControlData[mDimension * imin];^M
<             Real basisValue = mBasis.GetValue(0, imin);^M
<             for (int j = 0; j < mDimension; ++j)^M
<             {^M
<                 position[j] = basisValue * (*source++);^M
<             }^M
241,250d225
<             for (int i = imin + 1; i <= imax; ++i)^M
<             {^M
<                 basisValue = mBasis.GetValue(0, i);^M
<                 for (int j = 0; j < mDimension; ++j)^M
<                 {^M
<                     position[j] += basisValue * (*source++);^M
<                 }^M
<             }^M
<         }^M
<         */^M
Alleen in /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Mathematics: BSplineCurveGenerate.h
diff -r -w -b -B /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Mathematics/ImageUtility3.h Mathematics/ImageUtility3.h
329,344d328
< /*^M
< //wang.^M
<       static void DrawThickPixel3D(int x, int y, int z, int thick,^M
<             std::function<void(int, int, int)> const& callback)^M
<         {^M
<       for (int dz = -thick; dz <= thick; ++dz){^M
<             for (int dy = -thick; dy <= thick; ++dy)^M
<             {^M
<                 for (int dx = -thick; dx <= thick; ++dx)^M
<                 {^M
<                     callback(x + dx, y + dy, z + dz);^M
<                 }^M
<             }^M
<       }^M
<         }^M
< */^M
rmast commented 2 years ago

These are the differences for the Graphics-directory:


diff -r -w -b -B /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Graphics/GL45/GL45.h Graphics/GL45/GL45.h
11c11
< //#error gl.h included before OpenGL4.h^M
---
> #error gl.h included before OpenGL4.h
14c14
< //#error glext.h included before OpenGL4.h^M
---
> #error glext.h included before OpenGL4.h
diff -r -w -b -B /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Graphics/GL45/GTGraphicsGL45.h Graphics/GL45/GTGraphicsGL45.h
63c63
< //#if defined(GTE_USE_LINUX)^M
---
> #if defined(GTE_USE_LINUX)
65c65
< //#endif^M
---
> #endif
diff -r -w -b -B /home/robert/SDMD-resources/SourceCode/Code/shared/SplineGenerate/Graphics/Graphics.h Graphics/Graphics.h
24c24
< //#if defined(GTE_USE_LINUX)^M
---
> #if defined(GTE_USE_LINUX)
27c27
< //#endif^M
---
> #endif
rmast commented 2 years ago

(Left this repo, right the mentioned repo at the commit of 4p5)

The fixes on Graphics only seem to have to do with not setting GTE_USE_LINUX during the build.

So if I could find another way to involve that BSplineCurveGenerate.h for the custom software-build the rest of GeometricTools could be taken default and probably even 5.14.