Kalle Bladin
c01808ce10
Convert tabs to spaces.
2016-08-17 00:30:53 -04:00
Matthew Territo
c3ae58afba
Add access to deltaTime/getDt in SGCT/WindowWrapper
2016-08-11 19:19:07 -06:00
Alexander Bock
6bd0ef7102
Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
...
Add properties owned by OpenSpaceModule to the global settings engine (closing #104 )
2016-07-31 19:26:55 +02:00
Matthew Territo
fdb90f74ac
Added scene selector in the SettingsEngine, in the GUI under Global Properties.
...
Has placeholder functionality for what's coming in the next commit.
2016-07-27 16:45:43 -06:00
Matthew Territo
a2c96f5a36
Added ability to cycle through average frametime, FPS and average FPS
...
"t" and "Shift+t" are Lua bindings in common.lua
Maybe needs to be part of SettingsEngine instead, but the display code was already in RenderEngine, so it'll do for now on this branch
2016-07-20 16:33:37 -06:00
Alexander Bock
9df88a6a79
Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117 )
2016-07-18 14:54:36 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
Alexander Bock
6d8a16f19e
Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119 )
...
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120 )
- ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
- The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Alexander Bock
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
Alexander Bock
e40d393824
Make the DownloadManager not a singleton (closing #43 )
2016-06-30 00:43:03 +02:00
Alexander Bock
438e34b272
Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup
2016-06-27 02:11:49 +02:00
Alexander Bock
f2347a5f56
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
2016-06-17 11:31:33 +02:00
Matthew Territo
5925bd9c63
Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp
2016-06-16 17:03:48 +02:00
Alexander Bock
5cc278c97f
Add ModelMatrix retrieval to WindowWrapper
2016-06-16 00:57:31 +02:00
Gene Payne
d5ddaf84b8
Working on global settings integrated in gui but no functionality yet
2016-06-15 14:46:19 +02:00
Alexander Bock
30264fb00e
Add Lua function to check whether a specific module is loaded (closing #36 )
2016-06-04 19:38:56 +02:00
Alexander Bock
4409003524
Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
...
Conflicts:
data/scene/default.scene
2016-06-04 19:06:54 +02:00
Michael Nilsson
f9f9e9abd1
cleanup, update ghoul ref
2016-06-03 11:32:09 -04:00
Alexander Bock
0508faf7ce
Some changes to make GUI optional
2016-06-01 23:15:02 +02:00
Michael Nilsson
f2b802b317
MemoryFile har now char pointer and size instead of string
2016-05-06 16:39:24 -04:00
Michael Nilsson
d63dd7db44
remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile
2016-05-06 15:56:12 -04:00
Michael Nilsson
cbd6fd9234
iswacygnets now use new download funtions aswell
2016-05-06 15:09:09 -04:00
Michael Nilsson
47e2abf87d
new download function using std::future and std::async
2016-05-06 10:48:27 -04:00
Michael Nilsson
d0e6c8dd6e
removed progresscallback from downloadToMemory
2016-05-05 11:07:00 -04:00
Michael Nilsson
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -04:00
Alexander Bock
20532d704f
Rename Lua functions to preInitialization and postInitialization
...
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Alexander Bock
75175512a8
First implementation of moving the startup scripts into the scene description files
2016-04-27 16:46:31 +02:00
Sebastian Piwell
f13367e717
Kameleon plane
2016-04-25 10:37:06 -04:00
Sebastian Piwell
0246cd482e
Solved merge conflict
2016-04-22 20:01:15 -04:00
Sebastian Piwell
f6bbce8b4c
Add extension to futurefile
2016-04-22 17:39:45 -04:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Michael Nilsson
07dfafeddb
solve merge conflict with develop
2016-04-20 15:03:51 -04:00
Michael Nilsson
a068ca2030
load cygnets through mod file
2016-04-20 09:47:20 -04:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
a21c9538b6
Untabify more files
2016-04-18 15:15:30 +02:00
Sebastian Piwell
bf61f6f1e4
Load and read textures from memory
2016-04-06 14:17:29 -04:00
Michael Nilsson
49d8319938
merge with develop
2016-04-05 12:02:25 -04:00
Michael Nilsson
0d0f761d6e
downloadmanager return shared_ptr to FileFutures instead of bare pointers
2016-04-05 11:33:58 -04:00
Michael Nilsson
f4964b1628
request file extension
2016-04-01 16:32:18 -04:00
Michael Nilsson
5911149273
downloadmanager load to string. update texture function to renderabletextureplane
2016-03-23 16:57:25 -04:00
Emil Axelsson
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Alexander Bock
465715f652
Remove DummyWindowWrapper and implement default methods into WindowWrapper
2015-12-23 16:26:24 -05:00
Alexander Bock
c92fc923f9
Remove constants.h file
...
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock
c99666e75a
Cleaning ConfigurationManager and OpenSpaceEngine
...
Updated Ghoul version
2015-12-14 16:44:13 -08:00
Alexander Bock
adfc7d244c
Cleanup of WindowWrapper classes
2015-12-14 15:55:28 -08:00
Alexander Bock
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
Alexander Bock
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -08:00
Alexander Bock
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
