4c53f763f0
Recentering at Pluto,
...
Todo - add NH with kernels.
2015-01-23 12:10:21 -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
8ebd2e4d71
More code cleanup of RenderableFieldlines
2015-01-21 15:13:16 +01:00
f752221772
Added Vec4Property to imgui
2015-01-21 15:12:54 +01:00
d6a02140ea
More RenderableFieldlines code cleanup
2015-01-21 01:44:56 +01:00
f72d151c6c
Initial changes to RenderableFieldlines
2015-01-21 00:42:33 +01: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
ca39f5aaf5
begin cleanup, making code more transparent
2014-12-30 17:07:57 -05:00
a6a34cf7dd
projection GPU first results, pre-cleanup commit.
...
TODO:
- fixes so it reads mission specific modfile keywords (ie targets)
- speedup using one more pass (vertex map generated every something-frame)
- sequencing (timestamp check + load of separate images on-the-fly)
- pass in geometric data of target + target-texture switching (later)
2014-12-26 13:42:34 -05:00
ee306cf54c
Added separate shader for write to texture, relies on blend logic.
2014-12-22 10:02:31 -05:00
b14ff04f76
wip - piping projection-to-texture to GPU.
2014-12-18 12:00:27 -05:00
55a3c43db4
Move imgui file to its own folder
2014-12-18 17:21:20 +01:00
e45813dd91
Add stepping value into Property description
2014-12-18 13:46:18 +01:00
7cd1374cdb
Added description for OptionProperty
2014-12-17 18:52:01 +01:00
6336ee998a
Added description for SelectionProperty
2014-12-17 18:47:30 +01:00
618f3ab930
Add description for numerical properties
2014-12-17 18:18:34 +01:00
5a7a518bad
Remove cppcheck warnings
2014-12-16 21:54:53 +01:00
70569cba7f
fixes to restore to stage prior purge
2014-12-15 16:24:04 -05:00
734ce03d72
Changed the deinitialization of renderable from the destructorto the scenegraphnode
2014-12-15 20:51:00 +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
6360a5f66a
Add methods for generating Property descriptions
2014-12-12 14:47:08 +01:00
93a34fa985
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-12-12 11:00:26 +01:00
37a59f3f09
Removed assertions from renderable constructors
...
- Removed assertions from RenderableFieldlines constructor
- Removed assertions from RenderableFov constructor, the variables wasn't
even used.
- Removed assertions from RenderablePath constructor
- Fixed missing delete[] is RenderableSphericalGrid
- Removed assertions from RenderableTrail constructor, added glDelete*
functions
- Removed assertions from RenderablevolumeGL constructor
2014-12-12 10:59:28 +01:00
119b1eb335
Started work to produce descriptive output for Properties in preparation for GUI generation
2014-12-11 23:41:31 +01:00
e70b663dc3
Add log.html to the list of ignored files
...
Enable capability to disable on-screen info text
2014-12-11 18:09:19 +01:00
9e61d3ac94
Fixes for RenderableFov
2014-12-11 17:16:41 +01:00
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
dc21196f70
Removed RenderableEphemeris
2014-12-11 16:45:02 +01:00
122aec83b1
Windows fix after memory leak fixes
2014-12-11 14:12:01 +01:00
7b2b81ed54
Fix memory leaks and proper deinitialization
2014-12-11 10:13:10 +01:00
01361307f6
Update ghoul reference
...
- Added destructor to OpenSpaceEngine to deallocate SyncBuffer
- Changed texture reading to avoid memory leak
2014-12-10 20:57:41 +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
179f6edd9d
Added warning for SceneGraphNodes that were not loaded
2014-12-10 15:38:22 +01:00
302e642c1c
Dependency system for OpenSpace Modules
...
When loading the SceneGraph for the first time all modules are loaded
into a map and the parent dependency to another map. After all modules
and ScenegraphNodes have been loaded into the map, each module is loaded
in dependency order starting from the root node.
2014-12-10 14:35:08 +01:00
2883eaf254
Enable Gui integration of SelectionPropertys
2014-12-10 00:55:51 +01:00
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
fe73550b55
Add a TriggerProperty that fires a single event when a value is passed
2014-12-09 23:31:05 +01:00
759756ccb4
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/properties/optionproperty.cpp
2014-12-09 14:12:13 -05:00
7226b23cc0
Fixing doxygen warnings
2014-12-09 19:11:49 +01:00
82c42cb97a
General code cleanup
2014-12-09 18:36:23 +01:00
2c36b35ab1
Store less performance records, do not leak memory in GUI
2014-12-09 16:10:03 +01:00
01e71f2fc0
More work on performance measuring in imgui
2014-12-09 15:49:54 +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
b40ec16f1c
intermediate commit
2014-12-08 20:44:58 -05:00
Michal Marcinkowski