Commit Graph

648 Commits

Author SHA1 Message Date
Alexander Bock
1149a0d380 Compile fix for unit test cases where no windowwrapper is needed 2015-10-27 15:03:46 -05:00
Alexander Bock
327e2560be Remove X11 preprocessor defines for mouse buttons 2015-10-27 14:48:19 -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
Joakim Kilby
2f801a4171 adding a password check when changing hosts 2015-07-07 15:29:56 +02:00
Joakim Kilby
75b1e806ed including the header file missing from last commit... 2015-07-07 13:24:42 +02:00
Joakim Kilby
9cdc9c30d2 code cleanup and optimisation in the way threads are handled 2015-07-07 12:49:48 +02:00
Joakim Kilby
2a0787386e adding a forced time jump to trigger recomputation of trails when an init message is received 2015-07-07 08:21:10 +02:00
Joakim Kilby
987af4fb76 removing more obsolete functions 2015-07-06 18:55:49 +02:00
Joakim Kilby
b0eef21a2c removing obsolete functions and lua scripts 2015-07-06 18:49:17 +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
1de7a76cde Making changing the coordinate system a property in InteractionHandler 2015-07-06 16:14:49 +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
21225b1cb5 Making the setPropertyOwner method also add the calling property owner as a subowner 2015-07-06 15:54:48 +02:00
Joakim Kilby
51bab14dcc adding initialization messages functionality 2015-07-06 14:06:54 +02:00
Joakim Kilby
446aa544b8 Making origin a property 2015-07-06 13:10:59 +02:00
Joakim Kilby
d475d89b93 fixed a bug in deserialising of time message 2015-07-06 11:26:49 +02:00
Joakim Kilby
d76e18d9ee more work on scripting synchronization and state saving 2015-07-05 17:21:23 +02:00
Joakim Kilby
72dbf1ecc9 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/remote_redesign 2015-07-05 17:02:10 +02:00
Alexander Bock
a25b64c8b9 One more GCC fix 2015-07-05 17:01:47 +02:00
Joakim Kilby
01ef9d8e5d Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/remote_redesign 2015-07-05 17:01:44 +02:00
Alexander Bock
35cdfd4abe GCC compilation fix for Jenkins 2015-07-05 16:51:20 +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
Alexander Bock
03994b2758 Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name
Added documentation for getString/setString methods
2015-07-05 16:37:03 +02:00
Alexander Bock
75a64e770f Enable Properties to be set by strings 2015-07-05 16:23:48 +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
Joakim Kilby
a9824dabc1 Merge branch 'develop' into feature/remote 2015-07-03 16:18:59 +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
cb9bd514f6 added message type saying if initialisation is done and lua function + script
added current time and current delta time to initialisation scripts
2015-07-02 14:01:54 +02:00
Alexander Bock
bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +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
aea4a1ac0c added a receive thread. fixed a bug where threads tried to join/delete themselves 2015-07-01 12:17:20 +02:00
Joakim Kilby
d6cb939474 created a send que for messages and a thread to handle sending 2015-07-01 09:55:13 +02:00
Alexander Bock
2bde14b728 Fix crash that happens when SpiceManager is deinitialized 2015-06-26 19:20:56 +02:00
Joakim Kilby
8cc1498b57 made functions for script sharing public for now, temporary fix 2015-06-26 13:54:00 +02:00
Joakim Kilby
42dbf6a6a1 moved script parsing for library/function names into a separate function 2015-06-26 10:42:35 +02:00
Joakim Kilby
4fb40ceeb9 also changed name of scripts variable in header file.... 2015-06-26 09:23:30 +02:00
Joakim Kilby
2cd827a4fd added method to clear keyframes and call to that method when hostship is switched 2015-06-25 11:28:18 +02:00
Joakim Kilby
c32841e0ac added a vector of executed scripts to parallel connection.
vector is filled every time a script is sent or received
2015-06-24 19:44:17 +02:00
Joakim Kilby
7fa460e9dc changed definition of Lua function slightly to incorporate a boolean defining if the script should be shared or not.
added a constructor with the sharing variable as default to zero so every script doesn't have to be changed.
added functionality in runScript function to check if a script should be shared and if so send it.
2015-06-24 19:41:59 +02:00
Joakim Kilby
ff49a7cdd2 code cleanup, commenting, refactoring, and renaming.
fixed a bug where threads would not close down correctly on Unix systems
2015-06-24 17:52:21 +02:00