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
7f6d894866
Fixed more gcc and Cppcheck warnings
2015-02-23 20:07:57 +01:00
Alexander Bock
f59c9819c4
Fixing gcc warnings
2015-02-23 19:35:47 +01:00
Alexander Bock
fb2c99b5ed
Removed cppcheck warnings
...
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Alexander Bock
78ab23602f
Moved tinyobjloader from util into submodule of Ghoul
2015-02-23 18:08:28 +01:00
Alexander Bock
957495d46f
Merge remote-tracking branch 'origin/plutoViz' into develop
2015-02-23 16:13:00 +01:00
Michal Marcinkowski
175874adc7
Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz
...
Conflicts:
src/rendering/model/wavefrontgeometry.cpp
2015-02-23 09:57:26 -05:00
Michal Marcinkowski
770ee9212f
adding changes for rudimental target switching, needs work.
2015-02-23 09:56:29 -05:00
Alexander Bock
3ba9cbdb96
Linux compile fix
2015-02-23 14:18:21 +01:00
Alexander Bock
a7bd6319db
Adding 'property' prefix to subowner methods in PropertyOwner
...
Added function for writing documentation of properties
2015-02-22 22:05:25 +01:00
Michal Marcinkowski
cc65ce1167
changing obj loader to tinyobj
2015-02-22 13:10:47 -05:00
Alexander Bock
f00158969c
Cleanup of ImageSequencer
...
Added caching to playbook loading
Increased performance of playbook loading
Added default placeholder image
2015-02-19 16:21:28 +01: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
Joakim Kilby
ba53cf0e1f
added <stdint> include to fix compilation issue with int32_t datatype
2015-02-18 10:49:54 +01:00
Alexander Bock
e99148937d
Bugfixing a crash due to wrong decoding
2015-02-17 21:01:55 +01:00
Alexander Bock
d439157d4f
Linux compile fix with template specialization
2015-02-17 20:51:25 +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
Joakim Kilby
eb7fefb3c9
fixed Alex' bug!!
...
Added string specialization to template functions for syncbuffer class
2015-02-17 17:51:53 +01:00
Joakim Kilby
7c7b4f1f97
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
2015-02-17 14:41:02 +01:00
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
Joakim Kilby
5b3742961e
added function for getting un-synchronized position of the camera (only meant to be used on master for calculation of camera matrix and position)
2015-02-17 13:29:45 +01:00
Joakim Kilby
aa66bdeaa4
added synced versions of shared variables and modified set/get methods to adress the right versions of variables
2015-02-17 11:58:57 +01:00
Joakim Kilby
1cfabe6a2d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
2015-02-17 08:25:09 +01:00
Joakim Kilby
52e51b76bf
added initializedata struct
...
It is so far empty but will be used later on for initialization
2015-02-17 08:19:07 +01:00
Alexander Bock
69e0213e79
Added ability to disable shading for RenderablePlanet renderables
2015-02-16 19:23:23 +01:00
Joakim Kilby
a3ff828e91
Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
...
Conflicts:
src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock
55f7b0fc03
Move 'keys' file from interaction to util
2015-02-15 17:55:44 +01:00
Joakim Kilby
c6b358488b
changed sync variables for camera and time classes.
...
added a boolean _timeJumped which is synced and set to true whenever setTime is called.
(Note this is never set to false afterwards unless a call is made to setTimeJumped( bool ) with value false)
2015-02-13 11:02:35 +01:00
Joakim Kilby
2b83c19baa
commit to be able to merge
2015-02-12 14:58:40 +01:00
Joakim Kilby
a8abfa74bd
Added proper synchronization for mouse controller and camera.
...
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby
47ed14b8d6
Added serialize / deserialize functions for camera.
...
Added proper mutex protected shared versions of synced variables for camera class.
Added a post sync function for camera class (and a call to it in render engine post sync function)
2015-02-09 14:50:56 +01:00
Michal Marcinkowski
4dba4f4cee
minor changes / updates
2015-01-29 19:57:45 -05: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
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
812a9a48be
Normal computation in pre projection pass issue resolved.
2015-01-13 10:59:09 -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
Michal Marcinkowski
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
Jonas Strandstedt
bf0a8291d6
Updated to the most recent Ghoul
...
- Using new VertexBufferObject in PowerScaledSphere as a test case.
2014-12-15 17:10:43 +01:00
Michal Marcinkowski
70d24185de
intermediate commit prior to merge
2014-12-12 11:52:31 -05:00
Jonas Strandstedt
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
jonasstrandstedt
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
Michal Marcinkowski
6ef0181148
Merge branch 'develop' into solarsystem2
...
Conflicts:
include/openspace/util/spicemanager.h
2014-12-09 18:04:38 -05:00
Alexander Bock
7226b23cc0
Fixing doxygen warnings
2014-12-09 19:11:49 +01:00
Michal Marcinkowski
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
Alexander Bock
90eac194dc
Initial work on performance measuring
2014-12-09 01:41:42 +01:00
Alexander Bock
2c85d53164
Made GUI optional
2014-12-06 18:33:11 +01:00
Alexander Bock
4e4de3f40e
Changing the hardcoded bv-color map to a transfer function based map
2014-12-05 22:58:14 +01:00
