Simplified triangle inclusion test
Renaming
Merge