238aa09381
Refinements to image sequencing class and other, adaptation to the pluto setup
2015-01-29 13:01:31 -05:00
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
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
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
812a9a48be
Normal computation in pre projection pass issue resolved.
2015-01-13 10:59:09 -05:00
f37958c24f
beginning to work on sequencing
2015-01-10 16:07:05 -05:00
6b164f0b36
Added camera offset support
2015-01-06 12:43:16 +01:00
f032b4e3b0
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
bf0a8291d6
Updated to the most recent Ghoul
...
- Using new VertexBufferObject in PowerScaledSphere as a test case.
2014-12-15 17:10:43 +01:00
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
81caf96d72
Started working on Renderables
...
- Making sure isReady is properly set
- Making sure initialization is done correctly
- Making sure deinitialization is done correctly
2014-12-10 19:43:38 +01:00
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
7226b23cc0
Fixing doxygen warnings
2014-12-09 19:11:49 +01:00
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05:00
90eac194dc
Initial work on performance measuring
2014-12-09 01:41:42 +01:00
2c85d53164
Made GUI optional
2014-12-06 18:33:11 +01:00
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
d9fbf7c5fd
Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager
2014-12-05 16:43:54 +01:00
f1659e5c8b
Minor workover of the logging creating facility
2014-12-03 15:42:35 +01:00
0dc2a9d030
Allow the configuration file to request logging functionality
2014-12-03 00:39:42 +01:00
b05c4cf30f
Add capabilities to write out documentation of all Lua functions on startup
2014-11-29 14:03:49 +01:00
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
845469b15d
Merge branch 'develop' into solarsystem2
...
Conflicts:
openspace.cfg
shaders/generated/constants.hglsl
src/engine/openspaceengine.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
fc1dcfabc8
Some more changes to the RenderableStars class
2014-11-26 16:36:02 +01:00
b4f6070642
Started cleanup of RenderableStars class
2014-11-25 19:15:59 +01:00
e630f6efbb
Fixed bug that did not set cache directory correctly
...
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
f02234099f
Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file
2014-11-18 17:17:56 +01:00
a0503ba957
Modularizing font specification
2014-11-18 16:21:52 +01:00
5d1b0c694a
some cleanup.
2014-11-13 11:35:17 -05:00
46959b4801
Cleanup for KameleonWrapper
...
- Fixed so size and scale for RenderableVolumeGL can be deduced from model.
2014-11-11 13:43:38 +01:00
7e1396a8ae
Added separete ProgressBar class
2014-11-07 14:48:03 +01:00
3a2754fac7
Added support for more volume types
...
TODO:
- Test new type of volumes
2014-11-06 16:03:08 +01:00
2426d62677
Added target-switch method based on object visibility, will need refinement.
2014-11-05 19:26:11 -05:00
79b75aa572
field of view rendering. Intermediate commit.
...
Working on trying to get the fov-on-surface square to render.
2014-11-01 18:41:09 -04:00
e31a0b70ab
RenderableFov class.
...
Intersections with planet and instrument FOV boundary vectors / boresight seem to be correct with a margin of error. This could be either due to
precision issues experienced at greater distances, light-time or stellar aberration correction methods, planetary radius etc etc.
2014-10-27 21:35:59 -04:00
4bb9d8c800
Merge branch 'solarsystem2' into cleanup
...
Conflicts:
src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
ea3c5e8d11
More cleanup
2014-10-24 13:34:03 +02:00
ecfc4ad79a
reshaping the modelloader class to suit the overall design of openspace
2014-10-23 18:49:15 -04:00
08a97d9e68
Merge branch 'develop' into solarsystem2
...
Conflicts:
scripts/default_startup.lua
src/rendering/renderablewavefrontobject.cpp
2014-10-23 11:45:24 -04:00
5e410c6816
Removed unused files
2014-10-23 14:35:04 +02:00
a7da4d84cc
Added SyncBuffer class
...
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
54809c6376
Pluto geometry artefacts commit.
2014-10-20 18:29:55 -04:00
18a87ef99e
Added ScreenLog
...
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
bool properties that can be edited through Lua.
2014-10-17 12:20:23 +02:00
572651dba7
Added cotire to speed up compilation
2014-10-16 15:38:59 +02:00
c226e9b82f
Cleaned up code
...
Added new COMMON_FOLDER setting in scene file
Error handling when spice kernels are not available
2014-10-11 13:40:52 +02:00
3bb9912356
latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
...
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00
d3f66c4a7c
Merge branch 'solarsystem2' of openspace.itn.liu.se:/openspace into solarsystem2
...
Conflicts:
src/util/spicemanager.cpp
2014-10-08 16:27:51 -04:00
1ed4b74d3e
added renderablepath and made changes to renderabletrail
2014-10-08 16:15:37 -04:00
Michal Marcinkowski