Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
1c34a83f
Commit
1c34a83f
authored
7 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Adjusted documentation
parent
359d9703
master
107-opengl-view
dev
dev_bht
dev_cpp_code_conversion
dev_gui_features
dev_gui_features_zip_loading
3.16.0
3.15.0
archive/dev_gui_features_zip_loading
archive/dev_citygml3
archive/dev_GUI
2 merge requests
!8
Version 3.15.0
,
!6
Open source release of CityDoctorGUI and other extensions.
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmPlane.java
+3
-2
.../main/java/de/hft/stuttgart/citydoctor2/edge/GmPlane.java
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java
+6
-5
.../java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
+1
-1
...t/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
with
10 additions
and
8 deletions
+10
-8
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmPlane.java
+
3
-
2
View file @
1c34a83f
...
...
@@ -40,8 +40,9 @@ public class GmPlane {
UnitVector3d
r
=
UnitVector3d
.
of
(
n
.
getZ
(),
n
.
getX
(),
n
.
getY
());
r2
=
n
.
cross
(
r
).
toUnitVector
();
// r1 ist nicht in allen Faellen rechtwinklig zur Flaechennormalen
// daher nochmal eine neu Berechnung;
// r is not always perpendicular to the plane's normal vector,
// recalculate using r2
// ----------------------------------------------------------------
r1
=
n
.
cross
(
r2
).
toUnitVector
();
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java
+
6
-
5
View file @
1c34a83f
...
...
@@ -18,11 +18,13 @@
*/
package
de.hft.stuttgart.citydoctor2.edge
;
public
class
GmStraight2d
{
private
final
Point2d
origin
;
private
final
UnitVector2d
direction
;
public
GmStraight2d
(
Point2d
org
,
UnitVector2d
dir
)
{
this
.
direction
=
dir
;
this
.
origin
=
org
;
...
...
@@ -39,14 +41,13 @@ public class GmStraight2d {
}
/**
* Just intersects two GmStraights2d.
*
* Intersects this straight with another straight.
* <br>
* <br>
* If the two straights are parallel
the method will return false, so the user
*
has to determine, if the straight are just
parallel
or
identical
* If the two straights are parallel
, areParallel in the returned IntersectionResult will be true.
*
This method will not differentiate between
parallel
and
identical
straights.
*
* @param other
First S
traight
* @param other
the other s
traight
*
* @return intersection result
*/
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
+
1
-
1
View file @
1c34a83f
...
...
@@ -239,7 +239,7 @@ public class IntersectPlanarPolygons {
GmBoundedStraight
heStraight
=
e
.
getStraight
();
// Straights are colinear; checked in the handleEmdeddedEdges method
if
(
heStraight
.
isColinear
(
intersectingStraight
,
angleEpsilon
,
epsilon
))
{
if
(
heStraight
.
isCol
l
inear
(
intersectingStraight
,
angleEpsilon
,
epsilon
))
{
continue
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets