Anton Arbring
30dfc77d81
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/model/renderablemodel.cpp
src/rendering/renderablecrawlingline.cpp
src/rendering/renderableplaneprojection.cpp
2015-05-13 16:44:03 -04:00
Anton Arbring
a0042ef219
More last minute fixes
...
Fixed plane bug (again)
changed rex animation (again)
More key binds
etc
2015-05-13 16:15:50 -04:00
Michal Marcinkowski
1369e5caf5
adding capability to clear images on the fly
...
- (rest will be done on antons machine)
2015-05-13 15:19:41 -04:00
Alexander Bock
9366fd4b80
More clang fixes
2015-05-13 19:48:41 +02:00
Alexander Bock
597ed14014
Fixing CREDITS file
...
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock
28abe46bcf
Fixing various issues that appeared in Mac
...
Fixing flat qualifier in shader
Fix default values
Disable postFX shader
2015-05-13 16:52:25 +02:00
Alexander Bock
41c1293cc4
Merge commit '42ed21b01dc264c632ee6dc72c11d0f62d13df12' into feature/osx
2015-05-13 14:25:08 +02:00
Anton Arbring
906bcf10a5
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/renderablecrawlingline.cpp
src/rendering/renderengine.cpp
2015-05-12 23:29:14 -04:00
Anton Arbring
481f247a23
Pre presentation mods
...
Modified REX animation
Modified printouts in renderengine
More key binds
Fixed renderablePlaneProjection bug
changed dark side of projected planets
2015-05-12 23:23:29 -04:00
Alexander Bock
94c1e6e23c
Only create a handle message event with the correct size (in preparation for binary external controls)
2015-05-13 00:52:52 +02:00
Alexander Bock
a96a34575c
Fix initial message queueing by introducing a sleeping timer
2015-05-13 00:17:46 +02:00
Alexander Bock
b5846cc69b
Initiate thread sleeping after each initial message to not spam clients
2015-05-12 22:41:53 +02:00
Alexander Bock
072b9d7bef
Fix a crash that appeared with strcpy -> strcpy_s change
2015-05-12 22:22:31 +02:00
Alexander Bock
aa7830fed5
Added error when Label projection directory does not exist
2015-05-12 13:50:13 +02:00
Alexander Bock
b5aa86873a
Fix many warnings
2015-05-12 13:05:35 +02:00
Anton Arbring
cf857fc0f2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 18:41:25 -04:00
Anton Arbring
1cebc07939
Modified projections, removed fading and some key binds
2015-05-11 18:39:35 -04:00
Alexander Bock
c345774a0d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 23:30:12 +02:00
Alexander Bock
5027b32f9d
Add RenderableCrawlingLine for REX instrument on New Horizons
2015-05-11 23:29:27 +02:00
Anton Arbring
28f84eaab1
Removed printout..
2015-05-11 16:12:14 -04:00
Anton Arbring
70e50706c8
Merge branch 'develop' into trailmods
2015-05-11 15:28:31 -04:00
Anton Arbring
d6eaa0a81c
Added renderablePath with timestamps
...
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
2015-05-11 14:41:27 -04:00
Alexander Bock
9c16f088c1
Fixing errors that occured in OS X
...
Fixing a default success argument
Fixed \r line ending handling
Removed discarding a fragment in planetprojection
2015-05-08 19:26:29 +02:00
Alexander Bock
d508998b45
Merge branch 'develop' into feature/osx
...
Conflicts:
ext/ghoul
2015-05-08 16:28:35 +02:00
Alexander Bock
1177e4e4cf
Restructure parsers, send label parser information to GUI application
2015-05-07 18:26:23 +02:00
Alexander Bock
dac1f213b5
Fix instrumenttimes in labelparser
2015-05-07 17:42:37 +02:00
Alexander Bock
b536c5c32f
Merge branch 'develop' into feature/parser
2015-05-07 17:27:28 +02:00
Michal Marcinkowski
e0fedb203d
Merge branch 'develop' into NewHorizonsMerge
2015-05-05 20:33:52 -04:00
Michal Marcinkowski
665d832454
optimization for projections
2015-05-05 20:19:19 -04:00
Alexander Bock
e1c87a49ed
Redesign parser
2015-05-05 21:43:46 +02:00
Alexander Bock
02eaf6e7b9
Replaced asserts with ghoul_asserts
2015-05-05 17:57:18 +02:00
Alexander Bock
23a3950215
Fixing issue with linux
2015-05-05 17:46:51 +02:00
Alexander Bock
b35edde94a
Fixing issue with linux
2015-05-05 17:40:01 +02:00
Alexander Bock
dfca315293
Fixing issue with linux
2015-05-05 17:29:12 +02:00
Alexander Bock
b458e6c0f9
Yet another linux fix
2015-05-05 17:12:24 +02:00
Alexander Bock
335571879d
Fixing bug in linux with va_arg macros
2015-05-05 15:56:10 +02:00
Alexander Bock
b79acb1501
Fixing variable names to fix linux compile error
2015-05-05 15:45:00 +02:00
Alexander Bock
47af7a5270
Disabling the GUI applications on default, added possibility to enable them with a switch
...
Added additional check into the model loader to guard against empty models
2015-05-05 14:37:24 +02:00
Alexander Bock
74a15338ff
Merge branch 'feature/timelinegui' into develop
2015-05-05 14:22:56 +02:00
Alexander Bock
5b1ab8b692
Fix crash when changing coordinate system origin to Pluto
2015-05-05 14:10:37 +02:00
Alexander Bock
0c655e98f2
Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui
...
Conflicts:
src/rendering/renderengine.cpp
src/util/imagesequencer2.cpp
2015-05-05 11:42:49 +02:00
Michal Marcinkowski
f6d382f9f9
Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge
...
Conflicts:
src/rendering/renderengine.cpp
2015-05-04 20:27:52 -04:00
Michal Marcinkowski
0a1c0164ef
Fixes to trails, fov and adding some keybindings
2015-05-04 20:15:34 -04:00
Anton Arbring
f8d6f42f44
Default startup + renderengine fixes
...
Added interesting times for Dawn and Rosetta in default startup script.
Fixed coordinate system switch to Vesta, commented for demo but needed for
development.
2015-05-04 19:52:56 -04:00
Anton Arbring
17064a92d5
Modifying labelparser and imagesequencer2
...
For extension to handling other instruments than lorri
2015-05-04 19:40:08 -04:00
Anton Arbring
d495778d4a
Restored some changes lost in merge + "timedots"
...
Added impact on trails from start/stoptime definitions in modfile.
Added dots of equal time in trails, no progress on printing the time
string.
2015-05-04 19:30:57 -04:00
Anton Arbring
a993dfb42f
Storing frame-to-body relationship
...
Store frames for bodies in SpiceManager, still adding "IAU_" if
no frame is added for the body. Adding frames in renderableModel for
67p to get proper inertial frame.
2015-05-04 19:20:14 -04:00
Alexander Bock
fde0d10199
Fix error with instrument transmission over the network
2015-05-04 18:31:17 +02:00
Alexander Bock
314ce645f6
Fix a bug where OpenSpace would crash when too many field of views are generated
2015-05-04 11:55:53 +02:00
Alexander Bock
9a76f37573
Fix crashes with focus node change when view and camera vectors were almost the same but not equal
...
Fix crash when moving to time without any images
2015-05-03 00:14:01 +02:00
