search

OrebroUniversity / hiqp

GNU General Public License v3.0
9 stars 2 forks source link

Rebase feature-collision-check branch with master #28

Closed ksatyaki closed 7 years ago

ksatyaki commented 7 years ago

Need to rebase feature collision check branch with master.

neckutrek commented 7 years ago

The feature collision check branch deviates a bit with master when it comes to how the geometric primitive map is used. I think that the geometric primitives are extended with type identification which is used to downcast to subclasses. This should be corrected if rebased onto master so that hiqp_core can be left unaltered if possible. I wrote about this issue on the wiki.

ksatyaki commented 7 years ago

The GeometricPrimitiveMap seems only to be outdated. Not different.

neckutrek commented 7 years ago

Ok, then perhaps check the primitives namespace. I might be wrong too, if there are no changes everythings fine :)

Le 30 janv. 2017 22:10, "Chittaranjan Srinivas Swaminathan" < notifications@github.com> a écrit :

The GeometricPrimitiveMap seems only to be outdated. Not different.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/OrebroUniversity/hiqp/issues/28#issuecomment-276191426, or mute the thread https://github.com/notifications/unsubscribe-auth/ADmjhW67uXfgisD2aGS269qVKUb-LSzxks5rXlGrgaJpZM4LxnI9 .

ksatyaki commented 7 years ago

It has diverged quite a bit. Manual merge of features is required. Git tends to screw it up.

On Jan 30, 2017 10:32 PM, "Marcus A Johansson" notifications@github.com wrote:

Ok, then perhaps check the primitives namespace. I might be wrong too, if there are no changes everythings fine :)

Le 30 janv. 2017 22:10, "Chittaranjan Srinivas Swaminathan" < notifications@github.com> a écrit :

The GeometricPrimitiveMap seems only to be outdated. Not different.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/OrebroUniversity/hiqp/issues/ 28#issuecomment-276191426, or mute the thread https://github.com/notifications/unsubscribe-auth/ ADmjhW67uXfgisD2aGS269qVKUb-LSzxks5rXlGrgaJpZM4LxnI9 .

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/OrebroUniversity/hiqp/issues/28#issuecomment-276197370, or mute the thread https://github.com/notifications/unsubscribe-auth/AGuXcEo9ZOViS0Xtv3Y2_VR7oKS3DAtrks5rXlbOgaJpZM4LxnI9 .