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
e33c250bfc
Fixing issue with linux
2015-05-05 17:33:48 +02:00
Alexander Bock
dfca315293
Fixing issue with linux
2015-05-05 17:29:12 +02:00
Alexander Bock
0d11e6e2f8
Fixing issue with linux
2015-05-05 17:23:41 +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
4b9c5a9de6
Linux compile fix with ImageSequencer2
2015-05-05 14:40:47 +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
Alexander Bock
2f5114fe2d
More changes in timelinegui; show images even if start time and end time are outside the viewing frame
2015-05-05 10:58:10 +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
4451bbe920
More work on timeline application
...
Only showing the images that are inside of the timeline
Disabling all widgets when no connection is established
2015-05-04 17:29:18 +02:00
Alexander Bock
5704c8dcf6
Show the target of an instrument in the timeline view
2015-05-04 11:56:21 +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
810480d5d8
Enable focus node change
...
Show instruments
2015-05-04 10:02:47 +02:00
Alexander Bock
14270b316e
Bugfix fixing a crash with rendering
...
Started rendering of image data
2015-05-03 13:52:55 +02:00
Alexander Bock
d89760c9e9
More changes on TimelineView
2015-05-03 00:14:17 +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
Alexander Bock
8b9165fbfb
Added missing files
2015-05-02 22:24:27 +02:00
Alexander Bock
4f8c1e4a14
Added methods to Hongkang parser that publish the results
...
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00
Alexander Bock
bbb6258906
Update OpenSpace version
2015-04-28 14:25:48 +02:00
Alexander Bock
6f6b1b9f2c
Start work on making a port to Mac OS
2015-04-28 02:01:44 +02:00
Anton Arbring
632025c2a0
Miinor bugfix, get position of body instead of frame
2015-04-24 17:55:48 -04:00
Anton Arbring
d3bf8eb7f7
Merge branch 'timeadjustments' into NewHorizonsMerge
...
Conflicts:
CMakeLists.txt
include/openspace/rendering/model/modelgeometry.h
include/openspace/rendering/model/wavefrontgeometry.h
include/openspace/rendering/planets/renderableplanetprojection.h
include/openspace/util/imagesequencer.h
scripts/default_startup.lua
src/abuffer/abuffer.cpp
src/rendering/model/renderablemodel.cpp
src/rendering/model/wavefrontgeometry.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/planets/renderableplanetprojection.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/spiceephemeris.cpp
src/util/imagesequencer.cpp
2015-04-23 22:51:55 -04:00
Michal Marcinkowski
59ab268489
restore back some previous code
2015-04-23 00:13:11 -04:00
Michal Marcinkowski
2ad3b58898
Imagesequencer update:
...
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 22:01:50 -04:00
Michal Marcinkowski
7b9fc28f33
Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments
2015-04-22 21:54:05 -04:00
Michal Marcinkowski
8becbbde41
Imagesequencer update:
...
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 21:53:28 -04:00
Anton Arbring
9226dd2d6b
Setting show errors to false by default in Spicemanager
...
Removed debugging printouts
2015-04-22 21:43:54 -04:00
Anton Arbring
7913c74760
Changed shader for RenderablePlaneProjection
2015-04-22 18:36:09 -04:00
Anton Arbring
bc591b2bdb
Made night texture only be loaded if one exists, added new shader for planets with a night texture.
...
Also added plane & image plane shader programs to the general shader declaration in scene.cpp
2015-04-22 15:41:55 -04:00
Alexander Bock
07eaf6d7be
More work on Timelineview GUI application
2015-04-22 18:22:40 +02:00
Alexander Bock
19417d87c8
Moved networking functions into their own engine class
2015-04-22 18:22:19 +02:00
Anton Arbring
fd99115b6b
Proof of concept for changing target on with only body name present. Also removed some calculations in fov replaced by a imageplane instance
2015-04-21 20:53:31 -04:00
Anton Arbring
5cf614f03d
Modified changeViewPoint in order to work with new parenting system
2015-04-21 20:37:24 -04:00
Anton Arbring
97cbf977c5
Added body string to renderable to be able to search for target in scenegraph
2015-04-21 20:31:33 -04:00
Anton Arbring
641107a106
Commented currently unused functions in new parenting system
2015-04-21 20:22:58 -04:00
Anton Arbring
813cc4acdb
Added possible error message for estimated positions
2015-04-21 20:17:31 -04:00
Anton Arbring
163796cfdf
Simplified error suppressing in Spicemanager
2015-04-21 15:50:40 -04:00
Alexander Bock
411765ab4d
Added new files for GUI
2015-04-21 16:22:58 +02:00
