mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,422 Commits 99 Branches 46 Tags
b53efe4f0e90bb15946fee5ccbbc186b2b5ac09d
Commit Graph

62 Commits

Author SHA1 Message Date
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
Jonas Strandstedt
e4a8e87098 Using new ghoul ProgramObject functionality 
- Fixed risk of memory leak in SceneGraph (deleting shaders)
 2014-10-01 15:30:39 +02:00
Alexander Bock
dd15c4e3d0 Make the subcomponents not pointers in the first place 2014-09-27 18:41:03 +02:00
Alexander Bock
72aac7b240 Refactoring OpenSpaceEngine pointers into unique_ptr 
Compile fix for GCC
 2014-09-27 18:15:03 +02:00
Alexander Bock
0570bffb68 Cleanup of OpenSpaceEngine by factoring out ConfigurationManager class 2014-09-27 18:04:43 +02:00
Jonas Strandstedt
742b1016d4 Added logmanager in openspacengine.h 2014-09-26 17:33:39 +02:00
Alexander Bock
7359adf400 Replaced RuntimeData with separate, temporary structs that are passed around 2014-09-26 13:29:01 +02:00
Alexander Bock
8ec9bc6705 Cleaned up main.cpp 
Added functionality to send Lua scripts over the network
 2014-09-17 01:10:52 +02:00
Alexander Bock
ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Jonas Strandstedt
3006c30486 Added video export mode 2014-07-28 15:53:14 -04:00
Jonas Strandstedt
258e62caa2 Cleaned up before beginning ABuffer dynamic impl. 
- Added support for more keys in RenderableToggle
- Switched to Fixed ABuffer (needs to be fixed)
- Removed commented code
 2014-07-24 16:12:37 -04:00