0a1c0164ef
Fixes to trails, fov and adding some keybindings
2015-05-04 20:15:34 -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
7b9fc28f33
Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments
2015-04-22 21:54:05 -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
9226dd2d6b
Setting show errors to false by default in Spicemanager
...
Removed debugging printouts
2015-04-22 21:43:54 -04:00
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
19417d87c8
Moved networking functions into their own engine class
2015-04-22 18:22:19 +02:00
97cbf977c5
Added body string to renderable to be able to search for target in scenegraph
2015-04-21 20:31:33 -04:00
641107a106
Commented currently unused functions in new parenting system
2015-04-21 20:22:58 -04:00
163796cfdf
Simplified error suppressing in Spicemanager
2015-04-21 15:50:40 -04:00
f95b746ee1
Made position depend on parent
2015-04-20 11:34:19 -04:00
2b8b8c0416
Solving merge conflicts with develop
2015-04-18 16:10:05 -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
57800d12c7
added the possibility to load a city light/night texture for planets
2015-04-17 21:57:36 -04:00
9893a6ee20
Added temp method to get latest image in old imagesequencer
2015-04-17 21:25:33 -04:00
f5f1b03bc8
More Linux fixes
2015-04-17 13:45:20 +02:00
b254f56a5e
Linux compile fix
2015-04-17 13:38:30 +02:00
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
607988f35e
Renamed functions to something more reasonable
2015-04-17 11:35:26 +02:00
a0fa4eb192
Added function to remove child in SceneGraphNode
2015-04-16 12:09:46 -04:00
de6fcf1583
completely new imagesequencer class - WIP
2015-04-16 11:57:23 -04:00
0180130464
Fix multiple dependencies in SceneGraphNodes
2015-04-13 21:52:23 +02:00
e7767bff11
More work on SceneGraph
...
First working and sorted version
2015-04-13 16:07:27 +02:00
ccd58b7224
More restructuring work on SceneGraph
2015-04-12 14:50:43 +02:00
b95b7d9bb8
Fixing Jenkins error in spicemanager.h, double namespace qualification
2015-04-10 18:52:20 -04:00
a65e48b0e3
More work on SceneGraph
2015-04-10 01:38:59 +02:00
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
79f3052887
More work on SceneGraphLoader
...
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00
d124209281
new imagesequencer class - WIP.
...
Temporarily calling it "imagesequencer2"
2015-04-09 12:36:05 -04:00
9b24f407a6
Moving test files into base directory
...
Adding empty class of SceneGraphLoader
2015-04-07 19:01:04 +02:00
cae39f2788
updates to the imagesequencing & renderableplanet projection classes mainly
2015-03-24 12:31:03 -04:00
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
221db02af6
Refactoring modelgeometry and wavefrontgeometry
...
To make modelgeometry more ready for extension in reading other file
formats in subclasses. Some minor fixes including an out of bounds error
for texture mapping with several shapes in the same file.
2015-03-12 17:57:10 -04:00
8997fc0428
Merge branch '67p' into develop
2015-03-10 13:33:46 -04:00
4653d3d7c6
Minor fixes in renderablemodel
...
Added _performShading as a property and modified a spicemanager call to be able
to work with models with different names for the rotation source frame and
ephemeris body (such as 67p).
2015-03-10 12:22:52 -04:00
e6abdd97d2
Ability to request an OpenGL version from SGCT using commandline arguments
2015-03-03 14:53:35 +01:00
7da514b7cd
Enable operator<< overloading for TemplateProperties
2015-03-03 14:28:08 +01:00
c546b1e1be
Updated the OpenSpace version
2015-02-27 15:46:24 +01:00
87db591b41
Fixing on-screen gui for multiple nodes
2015-02-27 09:44:14 +01: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
e6c1f34d48
Fixed a crash with RenderablePlane
...
Fixed a crash with changing coordinate systems
2015-02-26 13:25:13 +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
a4e4df3d28
More cleanup of WaveFrontGeometry and RenderableModel
2015-02-25 23:58:30 +01:00
bd382f9e8e
Cleanup of WaveFrontGeometry
2015-02-25 23:39:20 +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
b3c4cc7a34
Make the line width of renderablefov changeable
2015-02-25 11:53:20 +01:00
5c72966346
Implemented caching for OBJ model files
2015-02-25 11:48:17 +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
Michal Marcinkowski