mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,040 Commits 99 Branches 46 Tags
0cdceddeeec8a84b9356ec0d280eddff46c27017
Commit Graph

399 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alexander Bock
19417d87c8 Moved networking functions into their own engine class 2015-04-22 18:22:19 +02:00
Anton Arbring
163796cfdf Simplified error suppressing in Spicemanager 2015-04-21 15:50:40 -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
9893a6ee20 Added temp method to get latest image in old imagesequencer 2015-04-17 21:25:33 -04: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
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
Anton Arbring
b95b7d9bb8 Fixing Jenkins error in spicemanager.h, double namespace qualification 2015-04-10 18:52:20 -04: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
Michal Marcinkowski
d124209281 new imagesequencer class - WIP. 
Temporarily calling it "imagesequencer2"
 2015-04-09 12:36:05 -04:00
Michal Marcinkowski
cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Anton Arbring
b79e6df763 Planets shape creation & fixed texture longitude 
Instead of spheres, the planets are now created as triaxial ellipsoids
according to the corresponding radii values in the SPICE kernels (if such
values are available). Apart from being more scientifically accurate, the
planets are shaped as the intersection functions in SPICE expects.

The textures will now also be aligned in longitude as in reality (w.r.t.
UTC) when using a texture map ranging from -180 in the left end to +180 on the
right, with 0 longitude in the middle (such as Greenwich in Earth texture)
 2015-03-20 19:59:26 -04:00
Alexander Bock
1a29ad6208 Merge branch 'develop' into plutoViz 2015-02-27 09:01:55 +01:00
Michal Marcinkowski
39e5f2aa28 Improvements to the ImageSequencer class. 
- Now _properly_ switches instruments at the moment set instrument is activated
 2015-02-26 15:50:37 -05:00
Alexander Bock
bd382f9e8e Cleanup of WaveFrontGeometry 2015-02-25 23:39:20 +01:00
Alexander Bock
e155e7ec9f Adding functionality to pause the simulation time 
Removed retreatTime function and replaced by a call to -advanceTime
 2015-02-25 17:50:34 +01:00
Alexander Bock
3155073f05 More changes to allow JupiterProjection and PlutoProjection in the same scene 
Add a switch that allows Renderables to react to big changes in time (via openspace.time.setTime)
Allow the setting of the minimum pixel size of stars
 2015-02-24 19:16:15 +01:00
Alexander Bock
43a3716afd Intermediate result to change viewpoint from Jupiter projection to Plutoprojection 2015-02-24 17:52:40 +01:00
Alexander Bock
84f8ce961b Added configuration switch "DisableRenderingOnMaster" to disable rendering on the master node 2015-02-24 13:42:47 +01:00
Alexander Bock
45e4dad29d Implement reference counting for SPICE kernels to shield SPICE from loading kernels multiple times 
Passing result of surface intercept method by parameter and returning success status
 2015-02-24 10:29:29 +01:00
Alexander Bock
45c148b2c8 Added error checking codes to SpiceManager 
Changed method to return instrument visibility by reference and used return value for errors
 2015-02-23 21:36:37 +01:00
Alexander Bock
7f6d894866 Fixed more gcc and Cppcheck warnings 2015-02-23 20:07:57 +01:00
Alexander Bock
f59c9819c4 Fixing gcc warnings 2015-02-23 19:35:47 +01:00
Alexander Bock
fb2c99b5ed Removed cppcheck warnings 
Removed unused Interface file
 2015-02-23 19:08:15 +01:00
Alexander Bock
78ab23602f Moved tinyobjloader from util into submodule of Ghoul 2015-02-23 18:08:28 +01:00
Alexander Bock
957495d46f Merge remote-tracking branch 'origin/plutoViz' into develop 2015-02-23 16:13:00 +01:00
Michal Marcinkowski
175874adc7 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz 
Conflicts:
	src/rendering/model/wavefrontgeometry.cpp
 2015-02-23 09:57:26 -05:00
Michal Marcinkowski
770ee9212f adding changes for rudimental target switching, needs work. 2015-02-23 09:56:29 -05:00
Alexander Bock
3ba9cbdb96 Linux compile fix 2015-02-23 14:18:21 +01:00
Alexander Bock
a7bd6319db Adding 'property' prefix to subowner methods in PropertyOwner 
Added function for writing documentation of properties
 2015-02-22 22:05:25 +01:00
Michal Marcinkowski
cc65ce1167 changing obj loader to tinyobj 2015-02-22 13:10:47 -05:00
Alexander Bock
f00158969c Cleanup of ImageSequencer 
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
 2015-02-19 16:21:28 +01:00
Joakim Kilby
3d04af03a3 Merge branch 'develop' into plutoViz 
Conflicts:
	include/openspace/rendering/planets/simplespheregeometry.h
	include/openspace/util/powerscaledsphere.h
	openspace.cfg
	shaders/pscstandard_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
 2015-02-18 15:52:35 +01:00
Joakim Kilby
ba53cf0e1f added <stdint> include to fix compilation issue with int32_t datatype 2015-02-18 10:49:54 +01:00