Commit Graph

58 Commits

Author SHA1 Message Date
Alexander Bock 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
Alexander Bock d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock 7bf24ec74e Remove the rendering method override 2015-06-26 23:31:51 +02:00
Alexander Bock 4411a4e4b2 Disable postFX for global blackout 2015-06-18 16:19:25 +02:00
Alexander Bock 613b6b3193 Move Spice kernels to new location
Enable loading of openspace.cfg in Loader
Make save locations based on FileSys tokens
Disable LIBCMT linking of applications that link against libOpenSpace
2015-06-17 00:23:57 +02:00
Alexander Bock e212d0b34f Making SyncWidget and ShortcutWidget modal windows
Enable correct progress callback for DownloadManager
2015-06-14 20:17:09 +02:00
Alexander Bock da812f3564 More cleanup of Launcher
Added Infowidget
2015-06-12 23:48:11 +02:00
Alexander Bock f1791d9816 Merge branch 'develop' into feature/downloadmanager
Conflicts:
	openspace.cfg
	src/engine/openspaceengine.cpp
	support/cmake/support_macros.cmake
2015-06-10 02:13:32 +02:00
Alexander Bock 8ad7702b75 Automatically detect which rendering method to use based on the available OpenGL version 2015-06-03 13:31:42 +02:00
Alexander Bock a9e3044d6a Changed openspace-data file token to point to correct data folder
Print detected OpenGL version
2015-06-03 12:36:20 +02:00
Alexander Bock 38c2477492 Rename DownloadEngine to DownloadManager 2015-05-27 17:14:20 +02:00
Alexander Bock 3a8a178c6a Undo change in openspace.cfg 2015-05-25 19:38:21 +02:00
Alexander Bock 659326b9a9 Remove 1500+ memory leaks in OpenSpace and Ghoul 2015-05-25 19:37:56 +02:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00
Alexander Bock e51df4b2a0 Sorting more classes into the correct modules 2015-05-20 21:40:52 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock abdd1af2a9 Cleaning up abuffer classes
Make ABuffer type selectable in openspace.cfg
2015-05-19 00:47:47 +02:00
Alexander Bock a8d97089e5 Write HTML log on default 2015-05-07 22:29:59 +02:00
Anton Arbring 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
Alexander Bock 9b24f407a6 Moving test files into base directory
Adding empty class of SceneGraphLoader
2015-04-07 19:01:04 +02:00
Michal Marcinkowski cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Alexander Bock bcfe0c6862 Remove unused line in config file 2015-03-04 20:01:55 +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
Alexander Bock 3c67788300 Disable HTML log on default
Restore default.scene
2015-02-20 13:57:56 +01:00
Alexander Bock d96b7146e3 Restore openspace.cfg 2015-02-19 11:16:02 +01:00
Michal Marcinkowski 971381b150 fov lines, check. 2015-02-18 19:41:56 -05: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
Alexander Bock 91195db6a0 Added reasonable size to the default single.xml
Added path tokens for spice kernels
2015-02-17 22:14:52 +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
Alexander Bock 862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01: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
Alexander Bock 56e1187ee7 Always create the GUI element but make it switchable via scripting 2014-12-08 12:41:31 +01:00
Alexander Bock 2c85d53164 Made GUI optional 2014-12-06 18:33:11 +01:00
Alexander Bock 5b072aa562 Set default logging level back to 'Debug' 2014-12-05 17:55:34 +01:00
Alexander Bock d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Alexander Bock f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Alexander Bock b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +01:00
Alexander Bock a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Jonas Strandstedt db141e8e86 Merge branch 'develop' into bug/abuffershadersupdater
Conflicts:
	ext/ghoul
	openspace.cfg
	src/abuffer/abuffer.cpp
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
Jonas Strandstedt 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
Alexander Bock 5396663848 Fix Jenkins compile error 2014-10-11 18:36:36 +02:00
Jonas Strandstedt 9a1b59a73e Intermediate commit 2014-10-10 11:29:16 +02:00
michal 1ed4b74d3e added renderablepath and made changes to renderabletrail 2014-10-08 16:15:37 -04:00
michal 96853d579b added changes to make things work on my end 2014-10-06 18:48:47 -04:00
Alexander Bock b667a4910c Reworked how SPICE kernels are loaded
- SpiceEphemeris can provide a list of kernels that are loaded when created
- Time and Leapsecond kernels are provided in the openspace.cfg file
2014-09-28 00:06:53 +02:00
Alexander Bock cfcf0247be More cleanup of ConfigurationManager 2014-09-27 19:13:36 +02:00
Alexander Bock e6576e88d6 Retrieve modules path from scene file instead openspace.cfg 2014-09-25 23:40:33 +02:00
Alexander Bock 27901c1629 Make GUI creation optional 2014-09-17 01:13:17 +02:00
Alexander Bock 9b2a04a8c4 More work on Time class
Fixed bool -> int conversion in SpiceManager
2014-09-14 15:51:46 +02:00
Alexander Bock 954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00