From c769022d2abc9503c36ea12037ba17912a491fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9meth=20=C3=81d=C3=A1m?= Date: Tue, 10 Nov 2015 14:25:45 +0100 Subject: [PATCH 1/2] fixed character which causes issue in generated source on android studio on windows --- iOS/G3MiOSSDK/Commons/Geometry/Vector2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/G3MiOSSDK/Commons/Geometry/Vector2D.cpp b/iOS/G3MiOSSDK/Commons/Geometry/Vector2D.cpp index a41d1ce047..878409ac7f 100644 --- a/iOS/G3MiOSSDK/Commons/Geometry/Vector2D.cpp +++ b/iOS/G3MiOSSDK/Commons/Geometry/Vector2D.cpp @@ -32,7 +32,7 @@ const std::string Vector2D::description() const { Vector2D Vector2D::intersectionOfTwoLines(const Vector2D& p1, const Vector2D& r1, const Vector2D& p2, const Vector2D& r2) { - //u = (p2 − p1) × r1 / (r1 × r2) + //u = (p2 - p1) × r1 / (r1 × r2) //out = p2 + u x r2 double u = ((p2.sub(p1)).dot(r1)) / r1.dot(r2); From 8c6d1ca9f8545b916e4eccd65f852b6ff9b671f9 Mon Sep 17 00:00:00 2001 From: aldeanueva Date: Mon, 4 Jan 2016 17:33:01 +0100 Subject: [PATCH 2/2] Generated --- .../G3MSharedSDK/src/org/glob3/mobile/generated/Vector2D.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Commons/G3MSharedSDK/src/org/glob3/mobile/generated/Vector2D.java b/Commons/G3MSharedSDK/src/org/glob3/mobile/generated/Vector2D.java index daf879eaf7..757e0cfd2c 100644 --- a/Commons/G3MSharedSDK/src/org/glob3/mobile/generated/Vector2D.java +++ b/Commons/G3MSharedSDK/src/org/glob3/mobile/generated/Vector2D.java @@ -156,7 +156,7 @@ public String toString() { public static Vector2D intersectionOfTwoLines(Vector2D p1, Vector2D r1, Vector2D p2, Vector2D r2) { - //u = (p2 − p1) × r1 / (r1 × r2) + //u = (p2 - p1) × r1 / (r1 × r2) //out = p2 + u x r2 double u = ((p2.sub(p1)).dot(r1)) / r1.dot(r2);