Commit Graph

116 Commits

Author SHA1 Message Date
Jonas Strandstedt
56e3851b8f Renamed CPUCapabilitiesComponent to GeneralCapabilitiesComponent 2014-12-12 14:55:16 +01:00
jonasstrandstedt
7b2b81ed54 Fix memory leaks and proper deinitialization 2014-12-11 10:13:10 +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
6d4ac1fe49 Add a new include path to the base shader folder
Move the RenderableStars shaders into a separate folder
2014-12-10 00:22:41 +01:00
Alexander Bock
82c42cb97a General code cleanup 2014-12-09 18:36:23 +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
2c85d53164 Made GUI optional 2014-12-06 18:33:11 +01:00
Alexander Bock
7fc33948ca Remove error logging from PowerScaledSphere 2014-12-06 17:51:25 +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
d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Jonas Strandstedt
d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Alexander Bock
14051455a5 Fix error that appears when creating directories on first start 2014-12-03 17:19:01 +01:00
Jonas Strandstedt
47c68ade3c Small fix for finding the SGCT configuration path 2014-12-03 16:42:22 +01:00
Alexander Bock
36d3b6bf74 Be able to set the SGCT configuration file using the commandline arguments 2014-12-03 16:09:24 +01:00
Alexander Bock
aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00
Alexander Bock
f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Jonas Strandstedt
fc6fbf1587 Fix for multi node rendering in release mode
- Working but maybe temporary fix checking that the SyncBuffer object is
  not nullptr.
- Might need changing from heap to stack allocated object
  instead.
2014-12-03 13:18:04 +01:00
Alexander Bock
0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Jonas Strandstedt
69ce7c9e00 Fix LuaConsole history issues
- Fix bug when adding command when history is empty
- Fixed loading of history from file
2014-12-02 11:48:15 +01:00
Alexander Bock
b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +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
a0503ba957 Modularizing font specification 2014-11-18 16:21:52 +01:00
Alexander Bock
2485b12738 Fix a crash with double deinitialization 2014-11-18 16:07:59 +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
f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00
Jonas Strandstedt
4bb9d8c800 Merge branch 'solarsystem2' into cleanup
Conflicts:
	src/util/factorymanager.cpp
2014-10-27 19:03:36 +01:00
Jonas Strandstedt
ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
michal
ecfc4ad79a reshaping the modelloader class to suit the overall design of openspace 2014-10-23 18:49:15 -04: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
jonasstrandstedt
490fbc4869 Linux fix 2014-10-21 21:44:29 +02:00
Jonas Strandstedt
0e52e759db Improved interaction for distance and origin 2014-10-21 17:04:58 +02:00
Jonas Strandstedt
8b8fd08cbb Merge branch 'bug/abuffershadersupdater' into develop 2014-10-21 16:04:11 +02:00
Jonas Strandstedt
db141e8e86 Merge branch 'develop' into bug/abuffershadersupdater
Conflicts:
	ext/ghoul
	openspace.cfg
	src/abuffer/abuffer.cpp
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
2014-10-21 14:54:48 +02:00
jonasstrandstedt
3f72adc854 Added copy/paste for Linux
- Requires xclip installed (otherwise nothing happens)
2014-10-20 22:13:59 +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
Jonas Strandstedt
18a87ef99e Added ScreenLog
- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
  bool properties that can be edited through Lua.
2014-10-17 12:20:23 +02:00
Alexander Bock
86efb3573b More work in preparing for lua-based keyboard controller
Modified ScriptManager to decouple adding libraries from registering libraries
Allowing ScriptManager to register libraries to other lua states as well
2014-10-14 00:08:26 +02:00
Alexander Bock
8884f4cc36 Started initial performance testing on Lua-based keyboard controller 2014-10-13 17:24:11 +02:00
Alexander Bock
0518e8cf02 Added fixed key mapping to KeyboardControl fixed
Cleanup of code
2014-10-13 10:29:04 +02:00
Alexander Bock
ff62c06320 Installed new InteractionHandler 2014-10-13 00:39:46 +02:00