Commit Graph

285 Commits

Author SHA1 Message Date
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 8e4cb00e5e Merge remote-tracking branch 'origin/develop' into features/imgui 2015-02-17 15:11:49 +01:00
Alexander Bock 97d97a8a16 Merge branch 'develop' into features/imgui 2015-02-17 15:11:25 +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 7764553a35 fixing bugs caused by merge 2015-02-17 13:30:45 +01:00
Joakim Kilby f096d9d9e3 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome
Conflicts:
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/luaconsole.cpp
	src/rendering/renderengine.cpp
2015-02-17 12:18:14 +01:00
Joakim Kilby 0f9476519c changed into average delta time instaed of delta time,
added calls to pre/pro sync and serialize/deserialize of scriptengine and time
2015-02-17 11:59:52 +01:00
Alexander Bock 862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Joakim Kilby 79d8bb40c5 added preSynchronization call to renderEngine in openspace engine.
added call to updateCamera for current focus node. (Note that this causes master to be 1 frame ahead of slaves and should be changed)
2015-02-17 08:21:49 +01:00
Alexander Bock 86b754f313 Clean up of LuaConsole class 2015-02-15 17:56:07 +01:00
Alexander Bock c57285c34f Fix of RenderableTrail 2015-02-14 10:52:17 +01:00
Alexander Bock 2e11d247d2 Remove a crash where ScriptManager was deinitialized wrongly 2015-02-14 10:41:54 +01:00
Joakim Kilby 737a5082fa MouseController created is now of the type OrbitalMouseController 2015-02-06 11:23:04 +01: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
Alexander Bock cd012548af Intermediate work on making imgui into components 2014-12-18 19:15:57 +01:00
Jonas Strandstedt b81133e381 Removes most of Visual Studio warnings 2014-12-16 19:09:32 +01:00
Jonas Strandstedt 56e3851b8f Renamed CPUCapabilitiesComponent to GeneralCapabilitiesComponent 2014-12-12 14:55:16 +01:00
jonasstrandstedt 7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +01:00
jonasstrandstedt 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
Alexander Bock 6d4ac1fe49 Add a new include path to the base shader folder
Move the RenderableStars shaders into a separate folder
2014-12-10 00:22:41 +01:00
Alexander Bock 82c42cb97a General code cleanup 2014-12-09 18:36:23 +01:00
Alexander Bock d8f7bb746a Started cleaning OpenSpaceEngine 2014-12-08 18:30:18 +01: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 7fc33948ca Remove error logging from PowerScaledSphere 2014-12-06 17:51:25 +01:00
Alexander Bock afa2d4d6a9 More work on GUI elements
Create GUI for some Properties
2014-12-06 17:20:59 +01:00
Alexander Bock 0a0543cc94 More callbacks implemented 2014-12-06 12:46:52 +01:00
Alexander Bock 9f7e1581de Allow unique input to the GUI
Move GUI from RenderEngine to OpenSpace engine
2014-12-06 12:33:06 +01:00
Alexander Bock d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Jonas Strandstedt d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Alexander Bock 14051455a5 Fix error that appears when creating directories on first start 2014-12-03 17:19:01 +01:00
Jonas Strandstedt 47c68ade3c Small fix for finding the SGCT configuration path 2014-12-03 16:42:22 +01:00
Alexander Bock 36d3b6bf74 Be able to set the SGCT configuration file using the commandline arguments 2014-12-03 16:09:24 +01:00
Alexander Bock aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00
Alexander Bock f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Jonas Strandstedt fc6fbf1587 Fix for multi node rendering in release mode
- Working but maybe temporary fix checking that the SyncBuffer object is
  not nullptr.
- Might need changing from heap to stack allocated object
  instead.
2014-12-03 13:18:04 +01:00
Alexander Bock 0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Jonas Strandstedt 69ce7c9e00 Fix LuaConsole history issues
- Fix bug when adding command when history is empty
- Fixed loading of history from file
2014-12-02 11:48:15 +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 432266ee6a Allow access to the console through OpenSpaceEngine
Enable scripting for showing/hiding the console
2014-11-18 19:39:25 +01:00
Alexander Bock 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
Alexander Bock f02234099f Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file 2014-11-18 17:17:56 +01:00
Alexander Bock a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Alexander Bock 2485b12738 Fix a crash with double deinitialization 2014-11-18 16:07:59 +01:00
Alexander Bock 6b40cb18fb Merge branch 'feature/interactionhandler' into develop
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
2014-11-18 15:46:26 +01:00
Jonas Strandstedt f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt 4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00