Commit Graph

172 Commits

Author SHA1 Message Date
Alexander Bock e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -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 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 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 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
Joakim Kilby 2d3ef442fb adding parallelconnection 2015-06-16 13:56:34 +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 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 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 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 afa2d4d6a9 More work on GUI elements
Create GUI for some Properties
2014-12-06 17:20:59 +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
Alexander Bock 0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +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 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 5225323a2b Cleaning up OpenSpaceEngine and RenderEngine 2014-10-23 18:13:40 +02:00
Jonas Strandstedt 9b1c993e89 Removed SGCT include from openspaceengine.h 2014-10-23 16:08:10 +02:00
Jonas Strandstedt 3ee8f85c14 Removed Flare 2014-10-23 15:35:55 +02:00
Jonas Strandstedt a7da4d84cc Added SyncBuffer class
- Added SyncBuffer class for easy and effecient synchronization
- Small changes to Camera class
- Forward declared a few classes to minimize dependencies
2014-10-22 16:37:54 +02:00
Jonas Strandstedt a8f3923659 Moved the lua command input to separete class
- Added functionality for keeping the input history
2014-10-22 13:04:55 +02:00
Jonas Strandstedt 5cd90db239 Added seconds version of the command input
- Using unix terminal style input history
- ctrl+c support to copy current command to clipboard
- ctrl+v support to paste current text from clipboard
2014-10-20 17:12:53 +02:00
Jonas Strandstedt dbef0d36e4 Initial command input support
- Access the command input prompt with  the § button on swedish keyboard
  layout. It is whatever key is corresponding to SGCT_KEY_BACKSLASH on
  other layouts.
2014-10-20 15:58:37 +02:00
Alexander Bock d67c9ffe8d Started changes for InteractionManager 2014-10-12 23:51:33 +02:00