version 4.0 little fixes

[vilkun]

In Version 4.0 VHACD I replaced X, Y, Z with X_INDEX, Y_INDEX, Z_INDEX because it was compile issues with my UE project, where I use their vector's X, Y, Z members.
1.txt

[vilkun]

also there several define X, Y, Z in a file

[vilkun]

[vilkun]

The whole patch can be
2.txt

[jratcliff63367]

Yikes, that's some ugly ass code. Not sure how that got in there. It's not mine. I will see if I can find a cleaner way to fix this.

[jratcliff63367]

Ok, thanks for catching this. That was as a result of two things. First, moving all of the implementation code into the header file; which caused the conflicts you saw. The second was just a lot of copy/paste that happened when merging a ton of utility code into the single monolithic header.

I have changed the #define X/Y/Z to be #define X_INDEX/Y_INDEX/Z_INDEX and removed the duplicate defines.

All methods that were previously called 'X', 'Y', 'Z', are now called 'getX', 'getY', 'getZ'.

Not only does this fix the build errors that you saw, it just makes the code cleaner and easier to understand.

Thanks for catching this. The fixes have been pushed to master.

[vilkun]

vhacd.txt
I returned to updating of vhacd, environment is: ubuntu, ue project, clang compiler.
There are many tiny issues too, could you check patch? Inside:

• skip lines with add_library , but you can add them as other cmake argument
• previous errors with X_INDEX, Y_INDEX, Z_INDEX
• compilation errors with 'variable hides other' added 'x_id', 'y_id', 'taskCost' just suffixes.
• variable order in constructor was valuable (compilation error), thus I reordered member mConcavity
• redundant AlignToPrincipalAxes
• JoinTask works wrong with asyncing turned on (UE project). It reraised task again. thats why I just commented out it. Also saw there was big update for these classes, so it can be leaved as my internal project issue.

[jratcliff63367]

How do I apply this patch? Sorry, I'm not familiar enough with the git process to do this. Can you make this in the form of a pull request?

[jratcliff63367]

I tried to do a 'git apply' with the patch file you provided but it fails

[vilkun]

Made a pr #109
I applied it on top of 'version4' branch:
git clone -b version4 https://github.com/kmammou/v-hacd.git
cd v-hacd (think you forgot this?)
git apply /home/vilkun/work/vhacd_build/1/vhacd.txt
Also you can try:
git apply --reject --whitespace=fix mychanges.patch
(see https://stackoverflow.com/questions/4770177/git-patch-does-not-apply )

It's a first time, when I write to really third party developers :)

[jratcliff63367]

Yeah, you should not be using the 'version4' branch. That was just a staging branch as I was developing the new version. That branch is not current or up to date. The only branch you should be working on now is simply the 'master' branch. Sorry for any confusion here.