Commit Graph

144 Commits

Author SHA1 Message Date
Alexander Bock 5456b5ee85 Started change moving from explicit SGCT functions to wrapper class 2015-10-25 13:50:39 -05:00
Alexander Bock f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock 678362eee2 Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack 2015-07-06 15:55:42 +02:00
Joakim Kilby 2188fc1809 Merge branch 'develop' into feature/remote
* develop: (72 commits)
  Disable blackout on startup
  Fixed path bug
  Remove the rendering method override
  Fix crash that happens when SpiceManager is deinitialized
  Adding convenient scripts for showing 67P and changing coordinate system to 67P
  Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
  Adding the possibility to project to arbitrary bodies model files
  Adding support for imageplanes for multiple instruments
  Fixing bug in model magnification
  Made destination optional in data specifications
  Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
  Remove setName function from OpenSpaceModule and move naming into constructor
  Always build libtorrent as a static library
  Set Launcher as default application Don't copy curl.dll on non-windows system
  Correct CURL cmake specification
  Add the FindCurl module from CMake into the support directory
  Fix method renaming error in volume module
  Updated data folder reference
  Make SpiceManager derive from Singleton
  Allow left-aligned and right-aligned messages in Launcher
  ...

Conflicts:
	modules/kameleon/CMakeLists.txt
	openspace.cfg
	src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
Joakim Kilby 13eb012a04 added a current run time variable for the openspace engine + get/set method.
run time is set in preSync from SGCT runtime at the moment
2015-06-24 17:51:32 +02:00
Joakim Kilby 9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Alexander Bock 5227ce2213 Renamed OpenSpaceModule's initialize method to create
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock 4d6663f824 Add a time-remaining counter to Launcher 2015-06-18 22:46:24 +02:00
Alexander Bock f58d6d91b5 Enable setting the capabilities verbosity using the configuration file 2015-06-18 14:29:34 +02:00
Alexander Bock 54186e5dcb Fix layout issues 2015-06-17 01:43:01 +02:00
Alexander Bock 850d9d3789 Multithreading the downloadrequests 2015-06-17 01:02:07 +02:00
Joakim Kilby 2d3ef442fb adding parallelconnection 2015-06-16 13:56:34 +02:00
Alexander Bock 2122369d92 Enable to abort downloads 2015-06-16 02:58:16 +02:00
Alexander Bock 886c8d2da6 Reenable bootstrapping of torrent DHTs
Enable setting of overwrite settings for download files
2015-06-15 19:58:23 +02:00
Alexander Bock 5967063754 More file cleanups 2015-06-15 19:37:06 +02:00
Alexander Bock 13bee28974 Enable multi-threaded download support for filerequests 2015-06-15 02:41:27 +02:00
Alexander Bock 0a233eb6bc More work on correct displaying status of single download files 2015-06-15 02:25:54 +02:00
Alexander Bock fb7f49a6bb Making single file download fully (and correctly) multithreaded 2015-06-15 02:05:56 +02:00
Alexander Bock 0a02906d8e More restructuring 2015-06-15 00:37:48 +02:00
Alexander Bock 549992b5e3 Work to using the request mechanism for downloading 2015-06-11 02:03:50 +02:00
Alexander Bock bf58c8ab75 Correctly copy libraries
Combine SyncWidget and openspace::DownloadManager
2015-06-10 02:37:37 +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 fc3faab5f1 Replace commandline argument with automatically detecting the supported OpenGL version 2015-05-28 20:33:22 +02:00
Alexander Bock 38c2477492 Rename DownloadEngine to DownloadManager 2015-05-27 17:14:20 +02:00
Alexander Bock b18ccfad23 Add DownloadEngine
Add curl library
2015-05-27 16:47:45 +02:00
Alexander Bock 77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock 4de4c015d7 Starting to clean out constants.h file by moving constants into the relevant classes 2015-05-20 16:32:28 +02:00
Alexander Bock 683ce14449 Various cleanups in main.cpp
Adapted to new Ghoul version
2015-05-19 13:58:00 +02:00
Alexander Bock 597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock 4f8c1e4a14 Added methods to Hongkang parser that publish the results
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00
Alexander Bock 19417d87c8 Moved networking functions into their own engine class 2015-04-22 18:22:19 +02:00
Alexander Bock e6abdd97d2 Ability to request an OpenGL version from SGCT using commandline arguments 2015-03-03 14:53:35 +01:00
Alexander Bock bac0a9ad31 Disable the swap barrier before the scene load (and reactivating it afterwards) 2015-02-24 19:13:50 +01:00
Alexander Bock fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Joakim Kilby a26214a38d Added boolean to OpenSpaceEngine declaring if this node is the master or not.
made sure it's set in the right place in main file.
removed all references to sgct::engine::instance()->isMaster() and replaced with calls to openspaceengine isMaster() function.
2015-02-20 10:45:33 +01:00
Joakim Kilby dce4835bab changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix. 2015-02-19 15:19:20 +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 97d97a8a16 Merge branch 'develop' into features/imgui 2015-02-17 15:11:25 +01:00
Alexander Bock a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Alexander Bock 862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Joakim Kilby 32a56085d9 Added a delta time member variable to openspace engine and changed how dt is calculated.
it is now averaged over two frames instead of being just dt between two frames. This gives more stability
2015-02-09 13:52:00 +01:00
Alexander Bock cd012548af Intermediate work on making imgui into components 2014-12-18 19:15:57 +01:00
Alexander Bock 55a3c43db4 Move imgui file to its own folder 2014-12-18 17:21:20 +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 2883eaf254 Enable Gui integration of SelectionPropertys 2014-12-10 00:55:51 +01:00
Alexander Bock fe73550b55 Add a TriggerProperty that fires a single event when a value is passed 2014-12-09 23:31:05 +01:00
Alexander Bock 2c36b35ab1 Store less performance records, do not leak memory in GUI 2014-12-09 16:10:03 +01:00
Alexander Bock 01e71f2fc0 More work on performance measuring in imgui 2014-12-09 15:49:54 +01:00
Alexander Bock d8f7bb746a Started cleaning OpenSpaceEngine 2014-12-08 18:30:18 +01:00