 Lingis
|
2370679fce
|
Removed Bezier, Bezier2 and Linear2 curve types
|
2020-02-05 16:41:29 -05:00 |
|
|
Emma Broman
|
e28435994f
|
Fix warning related to implicit conversion from int to char
|
2020-02-05 13:50:16 -05:00 |
|
|
Emma Broman
|
2b00e3054b
|
Remove forgotten comment
|
2020-02-05 13:47:11 -05:00 |
|
|
Emma Broman
|
750ce7f948
|
Replace lookAtRotation to a version that also works with navigationStates
|
2020-02-05 11:28:46 -05:00 |
|
|
Emma Broman
|
0f86c3d1ea
|
Merge master into branch, and resolve conflict in cfg file
|
2020-02-04 18:12:51 -05:00 |
|
|
Emma Broman
|
6acbee90f7
|
Resolve merge conflict
|
2020-02-04 18:10:02 -05:00 |
|
|
Emma Broman
|
d60ff85b5a
|
Remove custom easing functions. Use ghoul's instead
|
2020-02-04 18:07:47 -05:00 |
|
|
Emma Broman
|
40d634d249
|
Fix precision error by getPosition returning vec3 instead of dvec3
|
2020-02-03 17:11:36 -05:00 |
|
|
Lingis
|
cf8472cf34
|
Added accessors for rendering control points, for debugging
|
2020-02-03 11:19:31 -05:00 |
|
|
ElonOlsson
|
11aa87bd36
|
fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
|
2020-01-30 19:39:48 -05:00 |
|
|
Emma Broman
|
fdb9903713
|
Provide path position function, to use for rendering of path
|
2020-01-30 16:16:51 -05:00 |
|
|
Alexander Bock
|
04ce540102
|
Merge pull request #870 from OpenSpace/issue/848
Bring back stars to the Earth's night.
|
2020-01-30 14:56:39 -05:00 |
|
|
Alexander Bock
|
6a94b2267e
|
Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
|
2020-01-27 16:18:01 -05:00 |
|
|
Jonathas Costa
|
947a78a204
|
Changed night color behavior.
|
2020-01-27 14:58:05 -05:00 |
|
|
Jonathas Costa
|
6dcaa9e299
|
Merged master.
|
2020-01-27 14:26:21 -05:00 |
|
|
Jonathas Costa
|
47e89d2d74
|
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
|
2020-01-27 12:08:08 -05:00 |
|
|
Jonathas Costa
|
b19147fba7
|
Fixed bug was making atm disapear when night/water layer weren't active.
|
2020-01-27 12:07:15 -05:00 |
|
|
Alexander Bock
|
b545ab5c5b
|
Merge pull request #1050 from OpenSpace/issue/1049
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
|
2020-01-27 17:32:56 +01:00 |
|
|
GPayne
|
f682352b53
|
Merging with master
|
2020-01-27 09:14:35 -07:00 |
|
|
Lingis
|
9709a9c171
|
Merge
|
2020-01-26 17:39:24 -05:00 |
|
|
Lingis
|
c1c96cd81d
|
Bezier3 with more special cases handled and lookAt rotation
|
2020-01-26 17:22:25 -05:00 |
|
|
Micah
|
9be53ef77f
|
adding bounding sphere to renderabeltrailtrajectory
|
2020-01-26 16:31:44 -05:00 |
|
|
Emma Broman
|
e209e7cd6a
|
Add funciton and keybinding to stop playing a path
|
2020-01-26 16:30:20 -05:00 |
|
|
Emma Broman
|
da8a773122
|
Prevent steppnig out of bounds for t=1.0 in piecewise interpolation
|
2020-01-26 16:07:04 -05:00 |
|
|
Alexander Bock
|
b73b4270ed
|
Merge pull request #1026 from OpenSpace/feature/AALines2
Feature/aa lines2
|
2020-01-24 21:41:24 +01:00 |
|
|
Alexander Bock
|
4cef2be366
|
Small cleanup
|
2020-01-24 21:40:09 +01:00 |
|
|
Alexander Bock
|
49b6124dba
|
Merge pull request #1027 from OpenSpace/feature/RingShadows
Feature/ring shadows
|
2020-01-24 21:23:59 +01:00 |
|
|
Alexander Bock
|
9901d2b6fc
|
Merge pull request #1048 from OpenSpace/feature/distancelabels
Feature/distancelabels
|
2020-01-24 21:09:16 +01:00 |
|
|
Alexander Bock
|
87805f1db8
|
Coding style fixes
|
2020-01-24 21:08:54 +01:00 |
|
|
Emma Broman
|
c44fff4b22
|
Temporary solution for handling pauses in instruction
|
2020-01-24 11:07:25 -05:00 |
|
|
Emma Broman
|
965ce2a6a7
|
Prototype solution to provide curve type (kinda ugly)
|
2020-01-24 10:30:25 -05:00 |
|
|
eriksunden
|
e3b3aec1ed
|
Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size.
|
2020-01-24 15:53:29 +01:00 |
|
|
Emma Broman
|
aa8a2a98b3
|
Move path instruction class to its own file
|
2020-01-23 17:36:06 -05:00 |
|
|
Emma Broman
|
4ef577adf5
|
Resolve merge conflict in PathSegment constructor
|
2020-01-23 16:11:29 -05:00 |
|
|
Emma Broman
|
5fb34e24f8
|
Add posibility to include a start navigation state in path spec
|
2020-01-23 16:07:56 -05:00 |
|
|
Lingis
|
88b7dbe3eb
|
merge conflict fix
|
2020-01-23 15:48:55 -05:00 |
|
|
Lingis
|
4507ac69fe
|
Bezier3 added and set as default curve
|
2020-01-23 15:37:10 -05:00 |
|
|
Emma Broman
|
98d8c0159c
|
Update current time before we start stepping along the curve. Did not reach end before
|
2020-01-23 14:46:30 -05:00 |
|
|
Jonathas Costa
|
18ed125851
|
Merge branch 'master' into feature/AALines2
|
2020-01-22 12:41:28 -05:00 |
|
|
Jonathas Costa
|
c2d98983c1
|
Merge branch 'master' into feature/RingShadows
|
2020-01-22 12:40:42 -05:00 |
|
|
Jonathas Costa
|
8ae8d53629
|
Fixed blinking (precision) problems.
|
2020-01-22 11:33:19 -05:00 |
|
|
Emma Broman
|
a12aec668b
|
Merge branch 'thesis/2019/camera-paths' into path-segments
|
2020-01-22 11:32:51 -05:00 |
|
|
Emma Broman
|
a9492c426f
|
Merge branch 'master' into thesis/2019/camera-paths
|
2020-01-22 11:28:15 -05:00 |
|
|
Emma Broman
|
54dac17bfc
|
Minor refactor
|
2020-01-22 11:17:40 -05:00 |
|
|
Emma Broman
|
a197ed0e7f
|
Member variable for curve length and prepare for duration to be based on curve length
|
2020-01-22 11:09:05 -05:00 |
|
|
Emma Broman
|
146fc4ce8d
|
Approximate curve length
|
2020-01-22 11:02:34 -05:00 |
|
|
Jonathas Costa
|
904350d89b
|
Improved shadow blending.
|
2020-01-22 09:50:16 -05:00 |
|
|
Emma Broman
|
b528c6d4ab
|
Refactor helper interpolating functions a bit
|
2020-01-16 14:38:12 -05:00 |
|
|
Emma Broman
|
b9a34cd0f0
|
Fix issues with circular dependencies
|
2020-01-16 14:21:50 -05:00 |
|
|
Emma Broman
|
f8cf415ad3
|
Merge branch 'thesis/2019/camera-paths' into path-segments
|
2020-01-16 11:06:27 -05:00 |
|