Commit Graph

57 Commits

Author SHA1 Message Date
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
Alexander Bock
56e1187ee7 Always create the GUI element but make it switchable via scripting 2014-12-08 12:41:31 +01:00
Alexander Bock
9cd435f3e3 Fix imgui configuration definition 2014-12-07 00:39:16 +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
0a0543cc94 More callbacks implemented 2014-12-06 12:46:52 +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
a03523aa4f First version of imgui integration 2014-12-06 00:32:17 +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
f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +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
f02234099f Added code that checks for completeness (as defined in configurationmanager.cpp) of the configuration file 2014-11-18 17:17:56 +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
add7e06a64 Cleaning up ConfigurationManager 2014-09-27 18:54:10 +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
Jonas Strandstedt
114af3fb5b Added an OpenSpace ShaderCreator
- Global shader settings can now be added.
- ShaderCreator builds the shader and stores a generated shader file
with all included source.
- Small TransferFunction bugfix
2014-07-10 15:22:57 -04:00
Jonas Strandstedt
4379d27cbc Single Linked ABuffer implementation 2014-05-29 12:25:04 -04:00
Jonas Strandstedt
472869e1db Fix for Flare
- Fixed timestep error in Flare
- Added option to compile openspace with Flare only
2014-05-22 12:57:54 -04:00
Alexander Bock
56f22d79c3 Some work towards multi-pipe 2014-05-04 18:35:23 +02:00
Alexander Bock
cb6298b615 Cleanup of OpenSpaceEngine code
Renamed openspace.cfg variables to conform with format in scene description
2014-05-03 20:46:53 +02:00