Commit Graph

7077 Commits

Author SHA1 Message Date
Emma Broman
c674c220cd Merge branch 'thesis/2019/camera-paths' into camera-paths/avoid-collision 2020-05-18 13:07:56 +02:00
Emma Broman
f39e1958b5 Resolve merge conflict in cfg file 2020-05-18 12:01:22 +02:00
Emma Broman
d0cf7d0f3b Adapt AvoidCollisionCurve to updated PathCurve code 2020-05-18 10:29:28 +02:00
Emma Broman
e56a8b6ba9 Resolve merge conflict 2020-05-18 10:24:39 +02:00
Emma Broman
db06b4ba9f Merge branch 'camera-paths/curve-parameter-bug' into thesis/2019/camera-paths 2020-05-18 10:18:57 +02:00
Emma Broman
dd61dd9733 Remove approximated method, since online method is efficient enough 2020-05-18 10:16:54 +02:00
Emma Broman
3fde62b7ca Get changes from main branch and resolve merge conflict 2020-05-14 16:03:24 +02:00
Emma Broman
8d8a22a38a Minor refactor 2020-05-14 15:56:20 +02:00
Emma Broman
0d660a29bb Set default duration to the logaritm of path distance 2020-05-14 11:34:53 +02:00
Emma Broman
cb88f892c7 Use a constant tolerance for Newton's 2020-05-13 14:54:38 +02:00
Emma Broman
79d5af5d57 Increase nr iteration for Newton's method + small refactor 2020-05-13 14:38:21 +02:00
Alexander Bock
7c24a96b9e Add ability to change the line width of wire-type DU meshes (closes #1153) 2020-05-12 15:46:30 +02:00
Alexander Bock
f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z)
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
2020-05-12 15:27:24 +02:00
Emma Broman
f003274e62 Cleanup 2020-05-12 11:15:11 +02:00
Emma Broman
6811ed9025 Compute arc length using Gaussian quadrature instead of Simpson's 2020-05-12 10:53:40 +02:00
Emma Broman
b5a3d868ec Arc length reparameterization by computing sample pairs
Curve parameter (u) samples are computed from arc length values using a combination of Newton's method and bisection. Approximated curve parameter is comuted using a linear fit of the samples (OBS! Should be improved to a higher order later
)
2020-05-12 10:43:04 +02:00
Alexander Bock
3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
unknown
f2a328194d Optional rendering of orientation added to renderPath 2020-05-08 12:30:59 +02:00
unknown
544f2531b0 Functions for retrieving view direction added 2020-05-07 18:25:45 +02:00
Emma Broman
98ea3486c5 Fix error with large speed if t = 1.0 2020-05-07 09:06:24 +02:00
Emma Broman
a97d85b99b Fix faulty comparisons in Bezier3 2020-05-07 09:03:24 +02:00
GPayne
1b60ab1038 Fix for issue #1144 requires satellites vs request 2020-05-04 15:02:08 -06:00
Alexander Bock
498d125547 Merge pull request #1146 from OpenSpace/feature/sgct
Merging the changes to make the new SGCT version the default one
2020-05-04 10:48:48 +02:00
Emma Broman
4e5fdb686e Add option to render sample points of path as well 2020-05-01 15:02:22 +02:00
Emma Broman
b04528fa8a Get rid of some warnings in Bezier3 2020-05-01 14:46:04 +02:00
Emma Broman
96abb18ebe More includes cleanup 2020-05-01 13:15:17 +02:00
Emma Broman
89e88532f9 Cleanup some faulty includes 2020-05-01 13:05:29 +02:00
Emma Broman
408289fac4 Add scripts for rendering path and control points 2020-04-30 14:17:37 +02:00
Emma Broman
a1794f9535 Do some cleanup 2020-04-30 13:08:26 +02:00
Emma Broman
c463064170 Only show error once 2020-04-29 14:57:11 +02:00
Emma Broman
c979e6613d Add forgotten return 2020-04-29 14:50:20 +02:00
unknown
2291bcf658 Use rounded catmull-rom interpolatior instead 2020-04-29 14:45:36 +02:00
Emma Broman
4ff17ae078 Improved look at rotation interpolation 2020-04-29 13:50:14 +02:00
Emma Broman
b9de94c951 Rename rotation method that does't interpolate fully, to reduce confusion 2020-04-29 13:14:37 +02:00
unknown
24c0e7bf79 Merge from main, fixed collision in helperfunctions.cpp 2020-04-29 12:18:42 +02:00
unknown
83cd88e5e9 Added catmull-rom interpolator with alpha parameter 2020-04-29 11:41:04 +02:00
Emma Broman
138c2a269d Refactor 2020-04-29 09:29:33 +02:00
Gene Payne
3294c53013 Increased starting distance from earth for better content view 2020-04-28 08:11:27 -06:00
Alexander Bock
0fcd71be71 Add the ability to invert mouse buttons for OrbitalNavigator (closes #697) 2020-04-27 15:08:01 +02:00
Emma Broman
4367c81f33 Adapt to rebase 2020-04-27 14:49:25 +02:00
unknown
32a1f2d600 Bug fix: Replaced line with usage of unavailable variable 2020-04-27 14:43:04 +02:00
Lingis
ec0213e1c9 Go far out if end pos is in the opposite direction 2020-04-27 14:43:04 +02:00
Lingis
8a0b406a60 Go out point added for near planet cases 2020-04-27 14:43:04 +02:00
Lingis
3b2f2ff8e9 Adapt to rebase 2020-04-27 14:43:04 +02:00
Emma Broman
7aecf87d5b cleanup 2020-04-27 14:42:58 +02:00
Emma Broman
3bda1d961d Don't check collision at very start and end of a line 2020-04-27 14:42:13 +02:00
Emma Broman
2544810219 refactor 2020-04-27 14:42:13 +02:00
Emma Broman
ae5b5ec417 Prototype curve for creating collision free paths 2020-04-27 14:42:00 +02:00
Emma Broman
7757f160d7 Fix typo 2020-04-27 10:21:28 +02:00
Emma Broman
fbd1582f4e Merge branch 'camera-paths/speed' into thesis/2019/camera-paths 2020-04-27 09:53:43 +02:00