Commit Graph

265 Commits

Author SHA1 Message Date
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
2cf7dfb27d Changed RenderEngine to use Ghoul fontrendering instead of SGCT 2015-11-16 19:21:05 -05:00
Alexander Bock
a7807e5581 Updated Ghoul version 2015-11-13 18:18:42 -05:00
Alexander Bock
177ec6d568 Apply new changes to Fontrendering 2015-11-11 00:32:30 -05:00
Alexander Bock
c61d1cc861 Use correct window parameter for font rendering 2015-11-03 20:53:01 -05:00
Alexander Bock
bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -05:00
Alexander Bock
1149a0d380 Compile fix for unit test cases where no windowwrapper is needed 2015-10-27 15:03:46 -05:00
Alexander Bock
390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00
Alexander Bock
20861d68ad Changing WindowWrapper from pointer to reference 2015-10-26 15:10:15 -05:00
Alexander Bock
f3fd055db8 Rename WindowHandler to WindowWrapper 2015-10-26 15:00:46 -05:00
Alexander Bock
77857975a4 Changing the RenderEngine to use the SGCT window wrapper 2015-10-26 11:44:16 -05:00
Alexander Bock
062817b7fb More work moving code to window wrapper
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock
49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05: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
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
35e95b94e7 First version to update OpenSpace to the new SGCT version 2015-10-05 00:07:38 +02:00
Alexander Bock
72ba616414 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
Alexander Bock
405aa70352 Refix Devil vs FreeImage
Fix the downloading detection of filenames in Launcher
2015-07-07 14:48:20 +02:00
Alexander Bock
5d8383d91f Allowing PropertyOwners to have an empty name (pulling their properties and subowners into the owners namespace 2015-07-06 18:30:26 +02:00
Alexander Bock
174129be5e Merge commit '5c45815b9c509cbf98d1f3c7ad1e6035c4962a81' into feature/remote_redesign 2015-07-06 16:50:35 +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
Alexander Bock
0345cb2d28 Fix downloadmanager on Mac 2015-07-06 15:16:02 +02:00
Joakim Kilby
47b40e23d0 Merge branch 'develop' into feature/remote_redesign
* develop:
  Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name Added documentation for getString/setString methods
  Enable Properties to be set by strings
  Add a button to the SyncWidget to allow it to be closed
  Updated to new Ghoul version
  Make multithreaded download a toggle
  Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac
  Add commandline argument to OpenSpaceEngine to override scene file Make scene file selectable in Launcher, using the configurationfile value as default
  Non-Windows compile fix
  Include stylesheet in main file
  Add stylesheets and general improvements
2015-07-05 16:43:38 +02:00
Joakim Kilby
b53efe4f0e changed how time keyframes are used 2015-07-05 16:41:38 +02:00
Joakim Kilby
93e4a9b526 redesigning the communication protocol and message types.
also added time keyframes which are sent on a per-frame basis
2015-07-05 16:09:57 +02:00
Alexander Bock
df3688f04a Make multithreaded download a toggle 2015-07-04 22:03:54 +02:00
Alexander Bock
c375f18dac Add commandline argument to OpenSpaceEngine to override scene file
Make scene file selectable in Launcher, using the configurationfile value as default
2015-07-04 21:21:27 +02:00
Alexander Bock
003a438602 Removed while loops from path_vs that caused driver issues with big w values
Removed error that caused the postDraw method not to be called on slave nodes
2015-07-04 15:41:43 +02:00
Joakim Kilby
8c2b5bb199 Tons of stability improvements to threading of parallel connection.
changed name of variables and functions to reflect more what they do.
removed obsolete functions.
parallel connection is no longer in contact with main thread unless to be deleted
2015-07-03 14:43:48 +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
7159dd8246 further fixes to thread stability 2015-07-01 14:16:18 +02:00
Joakim Kilby
c1cf5f4581 added temporary functionality to be able to ensure that startup scripts are also synchronised over parallel connection if they should be. 2015-06-26 13:55:02 +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
2afd193a95 Set thread priority on Windows to not have the Launcher stall the system 2015-06-22 15:30:54 +02:00
Alexander Bock
cc76be6602 Update infowidgets in Launcher based on FileFutures and torrent_handles 2015-06-18 23:45:08 +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
Joakim Kilby
78f170048e moved deleteion of osparallelconnection 2015-06-17 15:04:55 +02:00
Joakim Kilby
cce351af69 removed all references to remotecontroller 2015-06-17 08:39:02 +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