mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 18:51:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,169 Commits 99 Branches 46 Tags
f2a7ea9630ef40368fc0987c8eb015780b8f2d1f
Commit Graph

104 Commits

Author SHA1 Message Date
Anton Arbring
75c268db08 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/renderengine.cpp
 2015-05-19 12:00:02 -04:00
Alexander Bock
cf4afc0159 Set default coordinate system to Jupiter to agree with the default time 2015-05-14 01:13:14 +02:00
Anton Arbring
7d513a5a1f Remove/change keybinds 2015-05-13 16:45:50 -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
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
Anton Arbring
1cebc07939 Modified projections, removed fading and some key binds 2015-05-11 18:39:35 -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
Michal Marcinkowski
665d832454 optimization for projections 2015-05-05 20:19:19 -04: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
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
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
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
Michal Marcinkowski
de6fcf1583 completely new imagesequencer class - WIP 2015-04-16 11:57:23 -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
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
d4f8bba27f Fixed crash with changing coordinate systems 
Adapted startup script to new openspace-data
 2015-02-26 18:07:37 +01:00
Alexander Bock
836f7a825b Making texture in RenderablePlane modular 
Disable rendering of the Sun by default in favor of the glare texture
 2015-02-26 13:10:43 +01:00
Alexander Bock
4a5682b88f Disable fadeIn on default 2015-02-25 19:13:14 +01:00
Alexander Bock
d249e9422e Fixed bug where ScriptEngine would complain about double-added libraries 
Correct application of default keybinding
 2015-02-25 17:57:25 +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
862c8ffd96 Renamed globalOpacity to globalblackout 
Start application in blackout and fade in after scenegraph has been loaded
 2015-02-25 09:37:55 +01:00
Alexander Bock
2d975234e7 Updated startup scripts 2015-02-25 00:04:45 +01:00
Alexander Bock
8170c7c2c5 Updated keys to reflect new Lua script functions 2015-02-24 21:14:16 +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
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
b6e0bd1043 Added interaction speed modifiers/inverters 
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
 2015-02-23 15:58:05 +01:00
Alexander Bock
34ff3c6018 More changes to RenderableStars using the AMNH test target 
Removed superfluous properties of RenderableStars
Removed specialized settings file
 2015-02-22 23:51:26 +01:00
Alexander Bock
c29555b530 Set new default values for star rendering 2015-02-20 22:16:44 +01:00
Alexander Bock
3c72ef8c1c Updated star rendering once more 
Added keys to fade rendering to black and restore
 2015-02-20 21:02:12 +01:00
Alexander Bock
4607c347a1 Merge branch 'feature/stars' into plutoViz 2015-02-20 14:00:19 +01:00
Alexander Bock
ec1344d3b7 One more small step towards working stars 2015-02-20 11:22:38 +01:00
Alexander Bock
5eb5a9a479 Enable the possibility to switch between coordinate systems (with the Sun in the center vs Pluto in the center) 2015-02-19 19:13:55 +01:00
Michal Marcinkowski
971381b150 fov lines, check. 2015-02-18 19:41:56 -05: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
Alexander Bock
a0fc77a893 Enable the ability to run setting scripts that are executed after the scene has been loaded 2015-02-17 20:10:50 +01:00
Michal Marcinkowski
2e1f806056 Added comments to default startup script with recommended dt and times of observations 2015-02-11 18:55:07 -05:00
Alexander Bock
3a18d0c763 More fixed for RenderableStars 
Added screenshot button for F4
 2015-02-09 08:35:06 +01:00
Michal Marcinkowski
238aa09381 Refinements to image sequencing class and other, adaptation to the pluto setup 2015-01-29 13:01:31 -05:00
Michal Marcinkowski
3928ff75fb testing issues with recentered projection (will fix in 24 h) 2015-01-26 12:44:44 -05:00
Michal Marcinkowski
1d5b051b65 Targeting fixes for pluto viz etc. 2015-01-23 17:54:32 -05:00
Michal Marcinkowski
4c53f763f0 Recentering at Pluto, 
Todo - add NH with kernels.
 2015-01-23 12:10:21 -05:00
Michal Marcinkowski
44e02465a1 Merge branch 'develop' into solarsystem2 
Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp
 2015-01-22 10:31:40 -05:00
Michal Marcinkowski
a8e5b61272 Image sequencing improvements and optimization of projection. 
Projection now occurs only at specified timestamps.
Todo:
projection class now dependent on image sequences, will have
to change that once we read specific instrument schedule.
 2015-01-21 11:28:38 -05:00
Michal Marcinkowski
fa0f26c9da In short, this is new: 
- ImageSequencer class added, requires planetary data service files (not added to openspace-data, too large)
   : Given current time returns path to specific image in dataset for projection.
- Changes to RenderablePlanetProjection class to accomodate sequencing
- Fixed normal computation in reverse-mapping stage
- Rudimental target recognition (will prob. become part of separate class at some point - since both fov & proj classes do similar things)

Next up:
- Redo pluto mockup visualization & begin spreadsheet reader for instrument-switching.
 2015-01-16 13:06:52 -05:00
Michal Marcinkowski
f37958c24f beginning to work on sequencing 2015-01-10 16:07:05 -05:00
jonasstrandstedt
6b164f0b36 Added camera offset support 2015-01-06 12:43:16 +01:00