7b1670ea0b
Remove startup warnings
2016-02-21 01:50:51 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
bae8d0aa76
Making OpenSpaceTest application compile with API change
...
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
b6fe3a004a
Fixed bind_keys script
2015-07-09 11:36:31 +02:00
284989d48c
Cleanup and refractoring of RenderableFov.cpp
...
- Removed code causing memleaks
- Improved MVIC intersection when no cornerpoints intersect
- General readability and logical fixes (long overdue)
- Fix so arbitrary amount of fov-bound-vectors can be loaded
- Updated keybinds & data etc
2015-07-08 00:14:01 -04:00
e1dcfd4780
Adding / changing a few keybinds
2015-07-06 14:38:04 -04:00
cafd89e9fa
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
scripts/default_startup.lua
2015-06-29 16:40:09 -04:00
d102a16a82
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
modules/newhorizons/rendering/renderableplanetprojection.cpp
modules/newhorizons/util/hongkangparser.cpp
modules/newhorizons/util/hongkangparser.h
modules/newhorizons/util/imagesequencer2.cpp
modules/newhorizons/util/labelparser.cpp
modules/newhorizons/util/labelparser.h
2015-06-29 16:39:09 -04:00
8fbd027a1e
Adding convenient scripts for showing 67P and changing coordinate system to 67P
2015-06-25 20:28:36 -04:00
e0ea622989
Adding hybrid read method for Pluto
...
Cleanups + logical changes to parsing and sequencing
2015-06-25 20:19:08 -04:00
7492fa2f6c
New Additions:
...
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
2015-06-03 19:10:34 -04:00
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
cf4afc0159
Set default coordinate system to Jupiter to agree with the default time
2015-05-14 01:13:14 +02:00
7d513a5a1f
Remove/change keybinds
2015-05-13 16:45:50 -04:00
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
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
1cebc07939
Modified projections, removed fading and some key binds
2015-05-11 18:39:35 -04:00
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
665d832454
optimization for projections
2015-05-05 20:19:19 -04:00
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
0a1c0164ef
Fixes to trails, fov and adding some keybindings
2015-05-04 20:15:34 -04:00
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
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
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
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
de6fcf1583
completely new imagesequencer class - WIP
2015-04-16 11:57:23 -04:00
d124209281
new imagesequencer class - WIP.
...
Temporarily calling it "imagesequencer2"
2015-04-09 12:36:05 -04:00
cae39f2788
updates to the imagesequencing & renderableplanet projection classes mainly
2015-03-24 12:31:03 -04:00
1a29ad6208
Merge branch 'develop' into plutoViz
2015-02-27 09:01:55 +01:00
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
d4f8bba27f
Fixed crash with changing coordinate systems
...
Adapted startup script to new openspace-data
2015-02-26 18:07:37 +01:00
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
4a5682b88f
Disable fadeIn on default
2015-02-25 19:13:14 +01:00
d249e9422e
Fixed bug where ScriptEngine would complain about double-added libraries
...
Correct application of default keybinding
2015-02-25 17:57:25 +01:00
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
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
2d975234e7
Updated startup scripts
2015-02-25 00:04:45 +01:00
8170c7c2c5
Updated keys to reflect new Lua script functions
2015-02-24 21:14:16 +01:00
43a3716afd
Intermediate result to change viewpoint from Jupiter projection to Plutoprojection
2015-02-24 17:52:40 +01:00
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
b6e0bd1043
Added interaction speed modifiers/inverters
...
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
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
c29555b530
Set new default values for star rendering
2015-02-20 22:16:44 +01:00
3c72ef8c1c
Updated star rendering once more
...
Added keys to fade rendering to black and restore
2015-02-20 21:02:12 +01:00
4607c347a1
Merge branch 'feature/stars' into plutoViz
2015-02-20 14:00:19 +01:00
ec1344d3b7
One more small step towards working stars
2015-02-20 11:22:38 +01:00
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
971381b150
fov lines, check.
2015-02-18 19:41:56 -05:00
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