Alexander Bock
5027b32f9d
Add RenderableCrawlingLine for REX instrument on New Horizons
2015-05-11 23:29:27 +02: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
d508998b45
Merge branch 'develop' into feature/osx
...
Conflicts:
ext/ghoul
2015-05-08 16:28:35 +02:00
Alexander Bock
b93aa9c80d
Set OpenSpace version string to prerelease-5
...
Only handle status messages in timeline application if playbooks are received
2015-05-07 23:40:31 +02:00
Alexander Bock
1177e4e4cf
Restructure parsers, send label parser information to GUI application
2015-05-07 18:26:23 +02:00
Alexander Bock
b2fcbe4fb0
Adding final keyword
2015-05-07 17:30:36 +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
e33c250bfc
Fixing issue with linux
2015-05-05 17:33:48 +02:00
Alexander Bock
0d11e6e2f8
Fixing issue with linux
2015-05-05 17:23:41 +02:00
Alexander Bock
4b9c5a9de6
Linux compile fix with ImageSequencer2
2015-05-05 14:40:47 +02:00
Alexander Bock
74a15338ff
Merge branch 'feature/timelinegui' into develop
2015-05-05 14:22:56 +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
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
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
b403513d63
Updated Spice version
...
More changes to make the application run
2015-04-28 15:07:58 +02:00
Alexander Bock
bbb6258906
Update OpenSpace version
2015-04-28 14:25:48 +02: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
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
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
19417d87c8
Moved networking functions into their own engine class
2015-04-22 18:22:19 +02: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
163796cfdf
Simplified error suppressing in Spicemanager
2015-04-21 15:50:40 -04:00
Anton Arbring
f95b746ee1
Made position depend on parent
2015-04-20 11:34:19 -04:00
Anton Arbring
2b8b8c0416
Solving merge conflicts with develop
2015-04-18 16:10:05 -04:00
Anton Arbring
6cc21b3be7
Added image plane projection + shaders and dynamic ephemeris.
...
The plane projection is now hard coded to target until it can be
returned from imagesequencer. The dynamic ephemeris is not used for
this at the moment but will come in handy later on.
2015-04-17 22:09:35 -04:00
Anton Arbring
57800d12c7
added the possibility to load a city light/night texture for planets
2015-04-17 21:57:36 -04:00
Anton Arbring
9893a6ee20
Added temp method to get latest image in old imagesequencer
2015-04-17 21:25:33 -04:00
Alexander Bock
f5f1b03bc8
More Linux fixes
2015-04-17 13:45:20 +02:00
Alexander Bock
b254f56a5e
Linux compile fix
2015-04-17 13:38:30 +02:00
Alexander Bock
c01bb7834b
Merge branch 'develop' into feature/scenegraphloader
...
Conflicts:
src/abuffer/abuffer.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
2015-04-17 13:31:39 +02:00
Alexander Bock
607988f35e
Renamed functions to something more reasonable
2015-04-17 11:35:26 +02:00
Anton Arbring
a0fa4eb192
Added function to remove child in SceneGraphNode
2015-04-16 12:09:46 -04:00
Michal Marcinkowski
de6fcf1583
completely new imagesequencer class - WIP
2015-04-16 11:57:23 -04:00
Alexander Bock
0180130464
Fix multiple dependencies in SceneGraphNodes
2015-04-13 21:52:23 +02:00
Alexander Bock
e7767bff11
More work on SceneGraph
...
First working and sorted version
2015-04-13 16:07:27 +02:00
Alexander Bock
ccd58b7224
More restructuring work on SceneGraph
2015-04-12 14:50:43 +02:00
Anton Arbring
b95b7d9bb8
Fixing Jenkins error in spicemanager.h, double namespace qualification
2015-04-10 18:52:20 -04:00
Alexander Bock
a65e48b0e3
More work on SceneGraph
2015-04-10 01:38:59 +02:00
Anton Arbring
914b3896ad
SPICE error handling, position/rotation estimation etc...
...
- When loading SPICE kernels, coverage for each body is stored.
- If the body does not have spk coverage a position is estimated.
- Added "pulsating" transparency levels for renderableModels with
estimated position.
- Spice manager clean up, left a few unused methods but removed a lot of
dead code.
- To support multiple missins being loaded, some errors are simply
ignored in spicemanager, for better or worse.
- Added start time and stop time as dictionary keys for renderables.
- Made RenderableTrails only show the time between gaps.
- Added but out commented vesta coordinate system swich in renderengine.
NOTE: Renderables using spiceEphemeris will give errors if body keyword
is omitted in modfile (When checking SPK coverage in position update).
2015-04-09 17:35:30 -04:00
